tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

fix for newer modp DH groups
(diffie-hellman-group14-sha256 etc)

Upstream-Regress-ID: fe942c669959462b507516ae1634fde0725f1c68
This commit is contained in:
djm@openbsd.org 2016-09-16 01:01:41 +00:00 committed by Damien Miller
parent 28652bca29
commit 0445ff1840
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
regress/misc/kexfuzz/kexfuzz.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kexfuzz.c,v 1.1 2016/03/04 02:30:37 djm Exp $ */ /* $OpenBSD: kexfuzz.c,v 1.2 2016/09/16 01:01:41 djm Exp $ */
/* /*
* Fuzz harness for KEX code * Fuzz harness for KEX code
* *
@ -231,12 +231,17 @@ do_kex_with_key(const char *kex, struct sshkey *prvkey, int *c2s, int *s2c,
sshbuf_free(state); sshbuf_free(state);
ASSERT_PTR_NE(server2->kex, NULL); ASSERT_PTR_NE(server2->kex, NULL);
/* XXX we need to set the callbacks */ /* XXX we need to set the callbacks */
#ifdef WITH_OPENSSL
server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
server2->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; server2->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
server2->kex->kex[KEX_DH_GRP14_SHA256] = kexdh_server;
server2->kex->kex[KEX_DH_GRP16_SHA512] = kexdh_server;
server2->kex->kex[KEX_DH_GRP18_SHA512] = kexdh_server;
server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
# ifdef OPENSSL_HAS_ECC # ifdef OPENSSL_HAS_ECC
server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
# endif
#endif #endif
server2->kex->kex[KEX_C25519_SHA256] = kexc25519_server; server2->kex->kex[KEX_C25519_SHA256] = kexc25519_server;
server2->kex->load_host_public_key = server->kex->load_host_public_key; server2->kex->load_host_public_key = server->kex->load_host_public_key;