diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-02-25 22:16:25 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-02-25 22:16:25 +0000 |
| commit | b8d694a6c63907ac20b8fa27613f3a47c191a2e0 (patch) | |
| tree | 9be7356d28dfe69b07f1482a830d5a6c866f8a31 | |
| parent | 2294f449acfc81dd7780c321515ddc11bad9075b (diff) | |
Support for ed25519 keys. from Tristan Le Guern with tweaks by sthen@
Ok deraadt@
| -rw-r--r-- | app/xdm/config/Xsession.cpp | 5 | ||||
| -rw-r--r-- | app/xinit/xinitrc.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/xdm/config/Xsession.cpp b/app/xdm/config/Xsession.cpp index 189845cbc..307136371 100644 --- a/app/xdm/config/Xsession.cpp +++ b/app/xdm/config/Xsession.cpp @@ -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 diff --git a/app/xinit/xinitrc.cpp b/app/xinit/xinitrc.cpp index 5230993ab..040622d87 100644 --- a/app/xinit/xinitrc.cpp +++ b/app/xinit/xinitrc.cpp @@ -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 |