diff options
author | markus@openbsd.org <markus@openbsd.org> | 2018-03-22 07:05:48 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-03-23 11:05:39 +1100 |
commit | 27979da9e4074322611355598f69175b9ff10d39 (patch) | |
tree | 23ebe1ac4d58cf0755722be6ec982a2f9b33b7e7 | |
parent | c6cb2565c9285eb54fa9dfbb3890f5464aff410f (diff) |
upstream: ssh/xmss: fix deserialize for certs; ok djm@
OpenBSD-Commit-ID: f44c41636c16ec83502039828beaf521c057dddc
-rw-r--r-- | sshkey.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.63 2018/03/02 02:08:03 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.64 2018/03/22 07:05:48 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -3005,9 +3005,14 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) | |||
3005 | case KEY_XMSS_CERT: | 3005 | case KEY_XMSS_CERT: |
3006 | if ((r = sshkey_froms(buf, &k)) != 0 || | 3006 | if ((r = sshkey_froms(buf, &k)) != 0 || |
3007 | (r = sshkey_add_private(k)) != 0 || | 3007 | (r = sshkey_add_private(k)) != 0 || |
3008 | (r = sshbuf_get_cstring(buf, &xmss_name, NULL)) != 0 || | ||
3008 | (r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 || | 3009 | (r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 || |
3009 | (r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0) | 3010 | (r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0) |
3010 | goto out; | 3011 | goto out; |
3012 | if (strcmp(xmss_name, k->xmss_name)) { | ||
3013 | r = SSH_ERR_INVALID_FORMAT; | ||
3014 | goto out; | ||
3015 | } | ||
3011 | if (pklen != sshkey_xmss_pklen(k) || | 3016 | if (pklen != sshkey_xmss_pklen(k) || |
3012 | sklen != sshkey_xmss_sklen(k)) { | 3017 | sklen != sshkey_xmss_sklen(k)) { |
3013 | r = SSH_ERR_INVALID_FORMAT; | 3018 | r = SSH_ERR_INVALID_FORMAT; |