upstream: hold our collective noses and use the openssl-1.1.x API in

OpenSSH; feedback and ok tb@ jsing@ markus@

OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417

1 files changed, 10 insertions, 5 deletions

diff --git a/kexdhc.c b/kexdhc.c
index 9a9f1ea78..a8b74247f 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -56,6 +56,7 @@ kexdh_client(struct ssh *ssh)
 {
         struct kex *kex = ssh->kex;
         int r;
+        const BIGNUM *pub_key;
 
         /* generate and send 'e', client DH public key */
         switch (kex->kex_type) {
@@ -81,15 +82,17 @@ kexdh_client(struct ssh *ssh)
                 goto out;
         }
         debug("sending SSH2_MSG_KEXDH_INIT");
-        if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0 ||
-            (r = sshpkt_start(ssh, SSH2_MSG_KEXDH_INIT)) != 0 ||
-            (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 ||
+        if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0)
+                goto out;
+        DH_get0_key(kex->dh, &pub_key, NULL);
+        if ((r = sshpkt_start(ssh, SSH2_MSG_KEXDH_INIT)) != 0 ||
+            (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 ||
             (r = sshpkt_send(ssh)) != 0)
                 goto out;
 #ifdef DEBUG_KEXDH
         DHparams_print_fp(stderr, kex->dh);
         fprintf(stderr, "pub= ");
-        BN_print_fp(stderr, kex->dh->pub_key);
+        BN_print_fp(stderr, pub_key);
         fprintf(stderr, "\n");
 #endif
         debug("expecting SSH2_MSG_KEXDH_REPLY");
@@ -104,6 +107,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
 {
         struct kex *kex = ssh->kex;
         BIGNUM *dh_server_pub = NULL, *shared_secret = NULL;
+        const BIGNUM *pub_key;
         struct sshkey *server_host_key = NULL;
         u_char *kbuf = NULL, *server_host_key_blob = NULL, *signature = NULL;
         u_char hash[SSH_DIGEST_MAX_LENGTH];
@@ -168,6 +172,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
 #endif
 
         /* calc and verify H */
+        DH_get0_key(kex->dh, &pub_key, NULL);
         hashlen = sizeof(hash);
         if ((r = kex_dh_hash(
             kex->hash_alg,
@@ -176,7 +181,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
             sshbuf_ptr(kex->my), sshbuf_len(kex->my),
             sshbuf_ptr(kex->peer), sshbuf_len(kex->peer),
             server_host_key_blob, sbloblen,
-            kex->dh->pub_key,
+            pub_key,
             dh_server_pub,
             shared_secret,
             hash, &hashlen)) != 0)