diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /ssh-ed25519-sk.c | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'ssh-ed25519-sk.c')
-rw-r--r-- | ssh-ed25519-sk.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-ed25519-sk.c b/ssh-ed25519-sk.c index b6f28c09a..f784776d4 100644 --- a/ssh-ed25519-sk.c +++ b/ssh-ed25519-sk.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-ed25519-sk.c,v 1.4 2019/11/26 03:04:27 djm Exp $ */ | 1 | /* $OpenBSD: ssh-ed25519-sk.c,v 1.5 2020/02/26 13:40:09 jsg Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -154,10 +154,8 @@ ssh_ed25519_sk_verify(const struct sshkey *key, | |||
154 | details = NULL; | 154 | details = NULL; |
155 | } | 155 | } |
156 | out: | 156 | out: |
157 | if (m != NULL) { | 157 | if (m != NULL) |
158 | explicit_bzero(m, smlen); /* NB mlen may be invalid if r != 0 */ | 158 | freezero(m, smlen); /* NB mlen may be invalid if r != 0 */ |
159 | free(m); | ||
160 | } | ||
161 | sshkey_sig_details_free(details); | 159 | sshkey_sig_details_free(details); |
162 | sshbuf_free(b); | 160 | sshbuf_free(b); |
163 | sshbuf_free(encoded); | 161 | sshbuf_free(encoded); |