diff options
author | markus@openbsd.org <markus@openbsd.org> | 2020-06-24 15:07:33 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-06-26 15:18:07 +1000 |
commit | e3fa6249e6d9ceb57c14b04dd4c0cfab12fa7cd5 (patch) | |
tree | ef4eb4ad9c929a4fbe2d4ffeb21446faf72a42e0 /sshkey.c | |
parent | 37f2da069c0619f2947fb92785051d82882876d7 (diff) |
upstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok
djm
OpenBSD-Commit-ID: d0002ffb7f20f538b014d1d0735facd5a81ff096
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.109 2020/06/22 05:58:35 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.110 2020/06/24 15:07:33 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. |
@@ -3600,10 +3600,12 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) | |||
3600 | case KEY_XMSS: | 3600 | case KEY_XMSS: |
3601 | case KEY_XMSS_CERT: | 3601 | case KEY_XMSS_CERT: |
3602 | if ((r = sshbuf_get_cstring(buf, &xmss_name, NULL)) != 0 || | 3602 | if ((r = sshbuf_get_cstring(buf, &xmss_name, NULL)) != 0 || |
3603 | (r = sshkey_xmss_init(k, xmss_name)) != 0 || | ||
3604 | (r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 || | 3603 | (r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 || |
3605 | (r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0) | 3604 | (r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0) |
3606 | goto out; | 3605 | goto out; |
3606 | if (type == KEY_XMSS && | ||
3607 | (r = sshkey_xmss_init(k, xmss_name)) != 0) | ||
3608 | goto out; | ||
3607 | if (pklen != sshkey_xmss_pklen(k) || | 3609 | if (pklen != sshkey_xmss_pklen(k) || |
3608 | sklen != sshkey_xmss_sklen(k)) { | 3610 | sklen != sshkey_xmss_sklen(k)) { |
3609 | r = SSH_ERR_INVALID_FORMAT; | 3611 | r = SSH_ERR_INVALID_FORMAT; |