upstream: Make sshpkt_get_bignum2() allocate the bignum it is

parsing rather than make the caller do it. Saves a lot of boilerplate code.

from markus@ ok djm@

OpenBSD-Commit-ID: 576bf784f9a240f5a1401f7005364e59aed3bce9

1 files changed, 5 insertions, 15 deletions

diff --git a/kexgexc.c b/kexgexc.c
index f2be35ab2..dec01fd4f 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.29 2018/12/27 03:25:25 djm Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.30 2019/01/21 09:54:11 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -100,13 +100,8 @@ input_kex_dh_gex_group(int type, u_int32_t seq, struct ssh *ssh)
 
         debug("got SSH2_MSG_KEX_DH_GEX_GROUP");
 
-        if ((p = BN_new()) == NULL ||
-            (g = BN_new()) == NULL) {
-                r = SSH_ERR_ALLOC_FAIL;
-                goto out;
-        }
-        if ((r = sshpkt_get_bignum2(ssh, p)) != 0 ||
-            (r = sshpkt_get_bignum2(ssh, g)) != 0 ||
+        if ((r = sshpkt_get_bignum2(ssh, &p)) != 0 ||
+            (r = sshpkt_get_bignum2(ssh, &g)) != 0 ||
             (r = sshpkt_get_end(ssh)) != 0)
                 goto out;
         if ((bits = BN_num_bits(p)) < 0 ||
@@ -177,13 +172,8 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, struct ssh *ssh)
                 r = SSH_ERR_SIGNATURE_INVALID;
                 goto out;
         }
-        /* DH parameter f, server public DH key */
-        if ((dh_server_pub = BN_new()) == NULL) {
-                r = SSH_ERR_ALLOC_FAIL;
-                goto out;
-        }
-        /* signed H */
-        if ((r = sshpkt_get_bignum2(ssh, dh_server_pub)) != 0 ||
+        /* DH parameter f, server public DH key, signed H */
+        if ((r = sshpkt_get_bignum2(ssh, &dh_server_pub)) != 0 ||
             (r = sshpkt_get_string(ssh, &signature, &slen)) != 0 ||
             (r = sshpkt_get_end(ssh)) != 0)
                 goto out;