Import openssh_8.0p1.orig.tar.gz

1 files changed, 5 insertions, 8 deletions

diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index 6e5999bb9..a860efc02 100644
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_kex.c,v 1.2 2015/07/10 06:23:25 markus Exp $ */
+/*      $OpenBSD: test_kex.c,v 1.4 2019/01/21 12:35:20 djm Exp $ */
 /*
  * Regress test KEX
  *
@@ -24,8 +24,6 @@
 #include "packet.h"
 #include "myproposal.h"
 
-struct ssh *active_state = NULL; /* XXX - needed for linking */
-
 void kex_tests(void);
 static int do_debug = 0;
 
@@ -139,20 +137,19 @@ do_kex_with_key(char *kex, int keytype, int bits)
         ASSERT_INT_EQ(ssh_init(&server2, 1, NULL), 0);
         ASSERT_PTR_NE(server2, NULL);
         ASSERT_INT_EQ(ssh_add_hostkey(server2, private), 0);
-        kex_free(server2->kex); /* XXX or should ssh_packet_set_state()? */
         ASSERT_INT_EQ(ssh_packet_set_state(server2, state), 0);
         ASSERT_INT_EQ(sshbuf_len(state), 0);
         sshbuf_free(state);
         ASSERT_PTR_NE(server2->kex, NULL);
         /* XXX we need to set the callbacks */
-        server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
-        server2->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
+        server2->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
+        server2->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
         server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
         server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
 #ifdef OPENSSL_HAS_ECC
-        server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
+        server2->kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
 #endif
-        server2->kex->kex[KEX_C25519_SHA256] = kexc25519_server;
+        server2->kex->kex[KEX_C25519_SHA256] = kex_gen_server;
         server2->kex->load_host_public_key = server->kex->load_host_public_key;
         server2->kex->load_host_private_key = server->kex->load_host_private_key;
         server2->kex->sign = server->kex->sign;