tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 15:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: fix bug that prevented certification of ed25519-sk keys

Browse Source 
OpenBSD-Commit-ID: 64c8cc6f5de2cdd0ee3a81c3a9dee8d862645996
This commit is contained in:
djm@openbsd.org 2019-11-18 06:39:02 +00:00 committed by Damien Miller
parent 85409cbb50
commit 740c4bc987
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sshkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.c,v 1.93 2019/11/15 06:00:20 djm Exp $ */ /* $OpenBSD: sshkey.c,v 1.94 2019/11/18 06:39:02 djm Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@ -2978,9 +2978,15 @@ sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
break; break;
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */
case KEY_ED25519_CERT: case KEY_ED25519_CERT:
case KEY_ED25519_SK_CERT:
if ((ret = sshbuf_put_string(cert, if ((ret = sshbuf_put_string(cert,
k->ed25519_pk, ED25519_PK_SZ)) != 0) k->ed25519_pk, ED25519_PK_SZ)) != 0)
goto out; goto out;
if (k->type == KEY_ED25519_SK_CERT) {
if ((ret = sshbuf_put_cstring(cert,
k->sk_application)) != 0)
goto out;
}
break; break;
#ifdef WITH_XMSS #ifdef WITH_XMSS
case KEY_XMSS_CERT: case KEY_XMSS_CERT: