summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keyscan.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2004-06-13 12:53:24 +0000
committerdjm <djm@openbsd.org>2004-06-13 12:53:24 +0000
commitaa9fa46df17bb1d9265db26ffa6cc9a65f07fff1 (patch)
treea3dd682bfda04d6547a0864f22daf31951665ec8 /usr.bin/ssh/ssh-keyscan.c
parentFix table add/replace commands with securelevel=2. (diff)
downloadwireguard-openbsd-aa9fa46df17bb1d9265db26ffa6cc9a65f07fff1.tar.xz
wireguard-openbsd-aa9fa46df17bb1d9265db26ffa6cc9a65f07fff1.zip
implement diffie-hellman-group14-sha1 kex method (trivial extension to
existing diffie-hellman-group1-sha1); ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
-rw-r--r--usr.bin/ssh/ssh-keyscan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c
index c83b7a49bcc..61107050797 100644
--- a/usr.bin/ssh/ssh-keyscan.c
+++ b/usr.bin/ssh/ssh-keyscan.c
@@ -7,7 +7,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.47 2004/03/08 09:38:05 djm Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.48 2004/06/13 12:53:24 djm Exp $");
#include <sys/queue.h>
#include <errno.h>
@@ -336,6 +336,7 @@ keygrab_ssh2(con *c)
"ssh-dss": "ssh-rsa";
c->c_kex = kex_setup(myproposal);
c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
+ c->c_kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
c->c_kex->verify_host_key = hostjump;