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) | |
| download | openssh-git-7cd31632e3a6607170ed0c9ed413a7ded5b9b377.tar.gz | |
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 d7bf3c69..3d3b78d7 100644 --- a/ssh-ecdsa.c +++ b/ssh-ecdsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-ecdsa.c,v 1.13 2016/04/21 06:08:02 djm Exp $ */ +/* $OpenBSD: ssh-ecdsa.c,v 1.14 2018/02/07 02:06:51 jsing Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * 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, explicit_bzero(digest, sizeof(digest)); sshbuf_free(b); sshbuf_free(bb); - if (sig != NULL) - ECDSA_SIG_free(sig); + ECDSA_SIG_free(sig); return ret; } @@ -180,8 +179,7 @@ ssh_ecdsa_verify(const struct sshkey *key, explicit_bzero(digest, sizeof(digest)); sshbuf_free(sigbuf); sshbuf_free(b); - if (sig != NULL) - ECDSA_SIG_free(sig); + ECDSA_SIG_free(sig); free(ktype); return ret; } |