diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 09:54:11 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 21:47:28 +1100 |
commit | 7be8572b32a15d5c3dba897f252e2e04e991c307 (patch) | |
tree | 449782dce059d2eb8d28aaa3baeaedd876b915a2 /kexgexs.c | |
parent | 803178bd5da7e72be94ba5b4c4c196d4b542da4d (diff) |
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
Diffstat (limited to 'kexgexs.c')
-rw-r--r-- | kexgexs.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexs.c,v 1.37 2019/01/19 21:43:56 djm Exp $ */ | 1 | /* $OpenBSD: kexgexs.c,v 1.38 2019/01/21 09:54:11 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 3 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -150,11 +150,7 @@ input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh) | |||
150 | } | 150 | } |
151 | 151 | ||
152 | /* key, cert */ | 152 | /* key, cert */ |
153 | if ((dh_client_pub = BN_new()) == NULL) { | 153 | if ((r = sshpkt_get_bignum2(ssh, &dh_client_pub)) != 0 || |
154 | r = SSH_ERR_ALLOC_FAIL; | ||
155 | goto out; | ||
156 | } | ||
157 | if ((r = sshpkt_get_bignum2(ssh, dh_client_pub)) != 0 || | ||
158 | (r = sshpkt_get_end(ssh)) != 0) | 154 | (r = sshpkt_get_end(ssh)) != 0) |
159 | goto out; | 155 | goto out; |
160 | 156 | ||