qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support for ed25519 keys. from Tristan Le Guern with tweaks by sthen@

Browse Source 
Ok deraadt@
This commit is contained in:
matthieu 2014-02-25 22:16:24 +00:00
parent 833d4245d3
commit c2e393c2e2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/xdm/config/Xsession.cpp
View File

@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
XCOMM $OpenBSD: Xsession.cpp,v 1.12 2013/05/19 07:22:53 ajacoutot Exp $
XCOMM $OpenBSD: Xsession.cpp,v 1.13 2014/02/25 22:16:24 matthieu Exp $
XCOMM redirect errors to a file in user's home directory if we can
@ -44,9 +44,10 @@ id1=$HOME/.ssh/identity
id2=$HOME/.ssh/id_dsa
id3=$HOME/.ssh/id_rsa
id4=$HOME/.ssh/id_ecdsa
id5=$HOME/.ssh/id_ed25519
if [ -z "$SSH_AGENT_PID" ];
then
if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ];
if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ];
then
eval `ssh-agent -s`
ssh-add < /dev/null

6
app/xinit/xinitrc.cpp
View File

@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
XCOMM $OpenBSD: xinitrc.cpp,v 1.10 2013/05/19 07:22:53 ajacoutot Exp $
XCOMM $OpenBSD: xinitrc.cpp,v 1.11 2014/02/25 22:16:24 matthieu Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@ -45,9 +45,11 @@ id1=$HOME/.ssh/identity
id2=$HOME/.ssh/id_dsa
id3=$HOME/.ssh/id_rsa
id4=$HOME/.ssh/id_ecdsa
id5=$HOME/.ssh/id_id_ed25519
if [ -z "$SSH_AGENT_PID" ];
then
if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ];
if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ];
then
eval `ssh-agent -s`
ssh-add < /dev/null