diff options
author | Colin Watson <cjwatson@debian.org> | 2016-02-29 12:15:15 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-03-08 11:51:22 +0000 |
commit | 46961f5704f8e86cea3e99253faad55aef4d8f35 (patch) | |
tree | 0dd97fa4fb649a62b4639fe2674380872b1f3e98 /ssh-ecdsa.c | |
parent | c753fe267efb1b027424fa8706cf0385fc3d14c1 (diff) | |
parent | 85e40e87a75fb80a0bf893ac05a417d6c353537d (diff) |
New upstream release (7.2).
Diffstat (limited to 'ssh-ecdsa.c')
-rw-r--r-- | ssh-ecdsa.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c index 2c76f8b43..74912dfd9 100644 --- a/ssh-ecdsa.c +++ b/ssh-ecdsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-ecdsa.c,v 1.11 2014/06/24 01:13:21 djm Exp $ */ | 1 | /* $OpenBSD: ssh-ecdsa.c,v 1.12 2015/12/11 04:21:12 mmcc 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. |
@@ -99,10 +99,8 @@ ssh_ecdsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, | |||
99 | ret = 0; | 99 | ret = 0; |
100 | out: | 100 | out: |
101 | explicit_bzero(digest, sizeof(digest)); | 101 | explicit_bzero(digest, sizeof(digest)); |
102 | if (b != NULL) | 102 | sshbuf_free(b); |
103 | sshbuf_free(b); | 103 | sshbuf_free(bb); |
104 | if (bb != NULL) | ||
105 | sshbuf_free(bb); | ||
106 | if (sig != NULL) | 104 | if (sig != NULL) |
107 | ECDSA_SIG_free(sig); | 105 | ECDSA_SIG_free(sig); |
108 | return ret; | 106 | return ret; |
@@ -179,10 +177,8 @@ ssh_ecdsa_verify(const struct sshkey *key, | |||
179 | 177 | ||
180 | out: | 178 | out: |
181 | explicit_bzero(digest, sizeof(digest)); | 179 | explicit_bzero(digest, sizeof(digest)); |
182 | if (sigbuf != NULL) | 180 | sshbuf_free(sigbuf); |
183 | sshbuf_free(sigbuf); | 181 | sshbuf_free(b); |
184 | if (b != NULL) | ||
185 | sshbuf_free(b); | ||
186 | if (sig != NULL) | 182 | if (sig != NULL) |
187 | ECDSA_SIG_free(sig); | 183 | ECDSA_SIG_free(sig); |
188 | free(ktype); | 184 | free(ktype); |