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 /dh.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 'dh.c')
-rw-r--r-- | dh.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dh.c,v 1.62 2016/12/15 21:20:41 dtucker Exp $ */ | 1 | /* $OpenBSD: dh.c,v 1.63 2018/02/07 02:06:50 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 3 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
4 | * | 4 | * |
@@ -135,10 +135,8 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg) | |||
135 | return 1; | 135 | return 1; |
136 | 136 | ||
137 | fail: | 137 | fail: |
138 | if (dhg->g != NULL) | 138 | BN_clear_free(dhg->g); |
139 | BN_clear_free(dhg->g); | 139 | BN_clear_free(dhg->p); |
140 | if (dhg->p != NULL) | ||
141 | BN_clear_free(dhg->p); | ||
142 | dhg->g = dhg->p = NULL; | 140 | dhg->g = dhg->p = NULL; |
143 | return 0; | 141 | return 0; |
144 | } | 142 | } |