diff options
| author |   jsing <jsing@openbsd.org> | 2018-02-07 02:06:50 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-02-07 02:06:50 +0000 |
| commit | e7fab504cc56b1bcad841564992d71bf5f905dce (patch) | |
| tree | b0d1b6c09c41af3c4dab09021a9275e15dc4a65f /usr.bin/ssh/ssh-ecdsa.c | |
| parent | remove mobileip(4) tendrils (diff) | |
| download | wireguard-openbsd-e7fab504cc56b1bcad841564992d71bf5f905dce.tar.xz wireguard-openbsd-e7fab504cc56b1bcad841564992d71bf5f905dce.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/ssh-ecdsa.c')
| -rw-r--r-- | usr.bin/ssh/ssh-ecdsa.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh-ecdsa.c b/usr.bin/ssh/ssh-ecdsa.c index b1272694417..fef0e006837 100644 --- a/usr.bin/ssh/ssh-ecdsa.c +++ b/usr.bin/ssh/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. @@ -97,8 +97,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; } @@ -176,8 +175,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; } |