diff options
| author |   markus <markus@openbsd.org> | 2018-03-22 07:05:48 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2018-03-22 07:05:48 +0000 |
| commit | 699d4343408b1ff5bd2de82fef19f3596e4ee8c2 (patch) | |
| tree | 458215320095c5ada49b707bcb8d0e7233fae4d6 /usr.bin/ssh/sshkey.c | |
| parent | Rewrite, since Karl Williamson <public at khwilliamson dot com> (diff) | |
| download | wireguard-openbsd-699d4343408b1ff5bd2de82fef19f3596e4ee8c2.tar.xz wireguard-openbsd-699d4343408b1ff5bd2de82fef19f3596e4ee8c2.zip | |
ssh/xmss: fix deserialize for certs; ok djm@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index cc84b115e3c..f41b0a1d0a1 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.63 2018/03/02 02:08:03 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.64 2018/03/22 07:05:48 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -2955,9 +2955,14 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) case KEY_XMSS_CERT: if ((r = sshkey_froms(buf, &k)) != 0 || (r = sshkey_add_private(k)) != 0 || + (r = sshbuf_get_cstring(buf, &xmss_name, NULL)) != 0 || (r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 || (r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0) goto out; + if (strcmp(xmss_name, k->xmss_name)) { + r = SSH_ERR_INVALID_FORMAT; + goto out; + } if (pklen != sshkey_xmss_pklen(k) || sklen != sshkey_xmss_sklen(k)) { r = SSH_ERR_INVALID_FORMAT; |