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 /kex.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 'kex.c')
-rw-r--r-- | kex.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.135 2018/01/23 05:27:21 djm Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.136 2018/02/07 02:06:50 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -587,11 +587,9 @@ kex_free(struct kex *kex) | |||
587 | u_int mode; | 587 | u_int mode; |
588 | 588 | ||
589 | #ifdef WITH_OPENSSL | 589 | #ifdef WITH_OPENSSL |
590 | if (kex->dh) | 590 | DH_free(kex->dh); |
591 | DH_free(kex->dh); | ||
592 | #ifdef OPENSSL_HAS_ECC | 591 | #ifdef OPENSSL_HAS_ECC |
593 | if (kex->ec_client_key) | 592 | EC_KEY_free(kex->ec_client_key); |
594 | EC_KEY_free(kex->ec_client_key); | ||
595 | #endif /* OPENSSL_HAS_ECC */ | 593 | #endif /* OPENSSL_HAS_ECC */ |
596 | #endif /* WITH_OPENSSL */ | 594 | #endif /* WITH_OPENSSL */ |
597 | for (mode = 0; mode < MODE_MAX; mode++) { | 595 | for (mode = 0; mode < MODE_MAX; mode++) { |