diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-03-19 15:40:03 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-03-19 15:40:03 +0000 |
| commit | 1d7c814fce3ebe98ce9ad85d945faa16bd1e589b (patch) | |
| tree | a9950a4d52d9eb270584cc6fed1117f70dc0dfb8 | |
| parent | c72524ef8f310e5a9a3444faa0c879cd5bb256a6 (diff) | |
Add support for ecdsa SSH keys. From dave at davec dot name. Thanks.
| -rw-r--r-- | app/xdm/config/Xsession.cpp | 5 | ||||
| -rw-r--r-- | app/xinit/xinitrc.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/xdm/config/Xsession.cpp b/app/xdm/config/Xsession.cpp index 4079917cf..b100a23be 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.6 2010/03/28 09:33:02 matthieu Exp $ +XCOMM $OpenBSD: Xsession.cpp,v 1.7 2011/03/19 15:40:02 matthieu Exp $ XCOMM redirect errors to a file in user's home directory if we can for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" @@ -21,7 +21,8 @@ XCOMM if we have private ssh key(s), start ssh-agent and add the key(s) id1=$HOME/.ssh/identity id2=$HOME/.ssh/id_dsa id3=$HOME/.ssh/id_rsa -if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 ]; +id4=$HOME/.ssh/id_ecdsa +if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ]; then eval `ssh-agent -s` ssh-add < /dev/null diff --git a/app/xinit/xinitrc.cpp b/app/xinit/xinitrc.cpp index e337f30fa..5f0f5cfcf 100644 --- a/app/xinit/xinitrc.cpp +++ b/app/xinit/xinitrc.cpp @@ -1,5 +1,5 @@ XCOMM!SHELL_CMD -XCOMM $OpenBSD: xinitrc.cpp,v 1.5 2010/05/31 20:23:19 matthieu Exp $ +XCOMM $OpenBSD: xinitrc.cpp,v 1.6 2011/03/19 15:40:02 matthieu Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap @@ -44,7 +44,8 @@ XCOMM if we have private ssh key(s), start ssh-agent and add the key(s) id1=$HOME/.ssh/identity id2=$HOME/.ssh/id_dsa id3=$HOME/.ssh/id_rsa -if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 ]; +id4=$HOME/.ssh/id_ecdsa +if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ]; then eval `ssh-agent -s` ssh-add < /dev/null |