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-ecdsa.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-ecdsa.c')
-rw-r--r-- | ssh-ecdsa.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c index d7bf3c69b..3d3b78d7b 100644 --- a/ssh-ecdsa.c +++ b/ssh-ecdsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-ecdsa.c,v 1.13 2016/04/21 06:08:02 djm Exp $ */ | 1 | /* $OpenBSD: ssh-ecdsa.c,v 1.14 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 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -101,8 +101,7 @@ ssh_ecdsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, | |||
101 | explicit_bzero(digest, sizeof(digest)); | 101 | explicit_bzero(digest, sizeof(digest)); |
102 | sshbuf_free(b); | 102 | sshbuf_free(b); |
103 | sshbuf_free(bb); | 103 | sshbuf_free(bb); |
104 | if (sig != NULL) | 104 | ECDSA_SIG_free(sig); |
105 | ECDSA_SIG_free(sig); | ||
106 | return ret; | 105 | return ret; |
107 | } | 106 | } |
108 | 107 | ||
@@ -180,8 +179,7 @@ ssh_ecdsa_verify(const struct sshkey *key, | |||
180 | explicit_bzero(digest, sizeof(digest)); | 179 | explicit_bzero(digest, sizeof(digest)); |
181 | sshbuf_free(sigbuf); | 180 | sshbuf_free(sigbuf); |
182 | sshbuf_free(b); | 181 | sshbuf_free(b); |
183 | if (sig != NULL) | 182 | ECDSA_SIG_free(sig); |
184 | ECDSA_SIG_free(sig); | ||
185 | free(ktype); | 183 | free(ktype); |
186 | return ret; | 184 | return ret; |
187 | } | 185 | } |