diff options
Diffstat (limited to 'ssh-ed25519-sk.c')
-rw-r--r-- | ssh-ed25519-sk.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ssh-ed25519-sk.c b/ssh-ed25519-sk.c index f42c88303..622cb45c2 100644 --- a/ssh-ed25519-sk.c +++ b/ssh-ed25519-sk.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-ed25519-sk.c,v 1.1 2019/11/12 19:29:24 markus Exp $ */ | 1 | /* $OpenBSD: ssh-ed25519-sk.c,v 1.2 2019/11/12 19:34:40 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -36,7 +36,6 @@ ssh_ed25519_sk_verify(const struct sshkey *key, | |||
36 | const u_char *data, size_t datalen, u_int compat) | 36 | const u_char *data, size_t datalen, u_int compat) |
37 | { | 37 | { |
38 | struct sshbuf *b = NULL; | 38 | struct sshbuf *b = NULL; |
39 | struct sshbuf *sigbuf = NULL; | ||
40 | struct sshbuf *encoded = NULL; | 39 | struct sshbuf *encoded = NULL; |
41 | char *ktype = NULL; | 40 | char *ktype = NULL; |
42 | const u_char *sigblob; | 41 | const u_char *sigblob; |
@@ -60,10 +59,9 @@ ssh_ed25519_sk_verify(const struct sshkey *key, | |||
60 | if ((b = sshbuf_from(signature, signaturelen)) == NULL) | 59 | if ((b = sshbuf_from(signature, signaturelen)) == NULL) |
61 | return SSH_ERR_ALLOC_FAIL; | 60 | return SSH_ERR_ALLOC_FAIL; |
62 | if (sshbuf_get_cstring(b, &ktype, NULL) != 0 || | 61 | if (sshbuf_get_cstring(b, &ktype, NULL) != 0 || |
63 | sshbuf_froms(b, &sigbuf) != 0 || | 62 | sshbuf_get_string_direct(b, &sigblob, &len) != 0 || |
64 | sshbuf_get_string_direct(sigbuf, &sigblob, &len) != 0 || | 63 | sshbuf_get_u8(b, &sig_flags) != 0 || |
65 | sshbuf_get_u8(sigbuf, &sig_flags) != 0 || | 64 | sshbuf_get_u32(b, &sig_counter) != 0) { |
66 | sshbuf_get_u32(sigbuf, &sig_counter) != 0) { | ||
67 | r = SSH_ERR_INVALID_FORMAT; | 65 | r = SSH_ERR_INVALID_FORMAT; |
68 | goto out; | 66 | goto out; |
69 | } | 67 | } |
@@ -123,7 +121,6 @@ ssh_ed25519_sk_verify(const struct sshkey *key, | |||
123 | free(m); | 121 | free(m); |
124 | } | 122 | } |
125 | sshbuf_free(b); | 123 | sshbuf_free(b); |
126 | sshbuf_free(sigbuf); | ||
127 | sshbuf_free(encoded); | 124 | sshbuf_free(encoded); |
128 | free(ktype); | 125 | free(ktype); |
129 | return r; | 126 | return r; |