summaryrefslogtreecommitdiff
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-08-06 10:49:58 +0100
committerColin Watson <cjwatson@debian.org>2016-08-06 10:49:58 +0100
commita8ed8d256b2e2c05b0c15565a7938028c5192277 (patch)
tree87abbdc914a38b43e4e5bb9581ad1f46eabbf88e /ssh-keyscan.c
parentf0329aac23c61e1a5197d6d57349a63f459bccb0 (diff)
parent99522ba7ec6963a05c04a156bf20e3ba3605987c (diff)
Import openssh_7.3p1.orig.tar.gz
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 7fe61e4e1..c30d54e62 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.105 2016/02/15 09:47:49 dtucker Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.106 2016/05/02 10:26:04 djm Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -302,6 +302,9 @@ keygrab_ssh2(con *c)
302#ifdef WITH_OPENSSL 302#ifdef WITH_OPENSSL
303 c->c_ssh->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; 303 c->c_ssh->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
304 c->c_ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; 304 c->c_ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
305 c->c_ssh->kex->kex[KEX_DH_GRP14_SHA256] = kexdh_client;
306 c->c_ssh->kex->kex[KEX_DH_GRP16_SHA512] = kexdh_client;
307 c->c_ssh->kex->kex[KEX_DH_GRP18_SHA512] = kexdh_client;
305 c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; 308 c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
306 c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; 309 c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
307# ifdef OPENSSL_HAS_ECC 310# ifdef OPENSSL_HAS_ECC