diff options
| author |   markus <markus@openbsd.org> | 2020-06-24 15:07:33 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2020-06-24 15:07:33 +0000 |
| commit | 727cc923955cb6461d3906a85eb4ab0eba93647e (patch) | |
| tree | bb5c3e347260b1b9504d49c21c085e7b87af1a71 /usr.bin/ssh/sshkey.c | |
| parent | Document eight additional pre-OpenSSL-1.1 accessor functions that are (diff) | |
| download | wireguard-openbsd-727cc923955cb6461d3906a85eb4ab0eba93647e.tar.xz wireguard-openbsd-727cc923955cb6461d3906a85eb4ab0eba93647e.zip | |
only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok djm
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 60736cd8c55..3b8e81c16f4 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.109 2020/06/22 05:58:35 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.110 2020/06/24 15:07:33 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -3545,10 +3545,12 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp) case KEY_XMSS: case KEY_XMSS_CERT: if ((r = sshbuf_get_cstring(buf, &xmss_name, NULL)) != 0 || - (r = sshkey_xmss_init(k, xmss_name)) != 0 || (r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 || (r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0) goto out; + if (type == KEY_XMSS && + (r = sshkey_xmss_init(k, xmss_name)) != 0) + goto out; if (pklen != sshkey_xmss_pklen(k) || sklen != sshkey_xmss_sklen(k)) { r = SSH_ERR_INVALID_FORMAT; |