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 /ssh-dss.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 'ssh-dss.c')
-rw-r--r-- | ssh-dss.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-dss.c,v 1.36 2018/01/23 05:27:21 djm Exp $ */ | 1 | /* $OpenBSD: ssh-dss.c,v 1.37 2018/02/07 02:06:51 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -107,8 +107,7 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, | |||
107 | ret = 0; | 107 | ret = 0; |
108 | out: | 108 | out: |
109 | explicit_bzero(digest, sizeof(digest)); | 109 | explicit_bzero(digest, sizeof(digest)); |
110 | if (sig != NULL) | 110 | DSA_SIG_free(sig); |
111 | DSA_SIG_free(sig); | ||
112 | sshbuf_free(b); | 111 | sshbuf_free(b); |
113 | return ret; | 112 | return ret; |
114 | } | 113 | } |
@@ -186,8 +185,7 @@ ssh_dss_verify(const struct sshkey *key, | |||
186 | 185 | ||
187 | out: | 186 | out: |
188 | explicit_bzero(digest, sizeof(digest)); | 187 | explicit_bzero(digest, sizeof(digest)); |
189 | if (sig != NULL) | 188 | DSA_SIG_free(sig); |
190 | DSA_SIG_free(sig); | ||
191 | sshbuf_free(b); | 189 | sshbuf_free(b); |
192 | free(ktype); | 190 | free(ktype); |
193 | if (sigblob != NULL) { | 191 | if (sigblob != NULL) { |