diff options
author | jsing@openbsd.org <jsing@openbsd.org> | 2018-02-07 02:06:50 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-02-08 09:26:27 +1100 |
commit | 7cd31632e3a6607170ed0c9ed413a7ded5b9b377 (patch) | |
tree | 2acf74a8e668468768bdf9fe1b48d2289b3299bb /kexgexs.c | |
parent | 3c000d57d46882eb736c6563edfc4995915c24a2 (diff) |
upstream commit
Remove all guards for calls to OpenSSL free functions -
all of these functions handle NULL, from at least OpenSSL 1.0.1g onwards.
Prompted by dtucker@ asking about guards for RSA_free(), when looking at
openssh-portable pr#84 on github.
ok deraadt@ dtucker@
OpenBSD-Commit-ID: 954f1c51b94297d0ae1f749271e184141e0cadae
Diffstat (limited to 'kexgexs.c')
-rw-r--r-- | kexgexs.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexs.c,v 1.31 2017/05/30 14:23:52 markus Exp $ */ | 1 | /* $OpenBSD: kexgexs.c,v 1.32 2018/02/07 02:06:51 jsing 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. |
@@ -237,14 +237,12 @@ input_kex_dh_gex_init(int type, u_int32_t seq, struct ssh *ssh) | |||
237 | out: | 237 | out: |
238 | DH_free(kex->dh); | 238 | DH_free(kex->dh); |
239 | kex->dh = NULL; | 239 | kex->dh = NULL; |
240 | if (dh_client_pub) | 240 | BN_clear_free(dh_client_pub); |
241 | BN_clear_free(dh_client_pub); | ||
242 | if (kbuf) { | 241 | if (kbuf) { |
243 | explicit_bzero(kbuf, klen); | 242 | explicit_bzero(kbuf, klen); |
244 | free(kbuf); | 243 | free(kbuf); |
245 | } | 244 | } |
246 | if (shared_secret) | 245 | BN_clear_free(shared_secret); |
247 | BN_clear_free(shared_secret); | ||
248 | free(server_host_key_blob); | 246 | free(server_host_key_blob); |
249 | free(signature); | 247 | free(signature); |
250 | return r; | 248 | return r; |