1 files changed, 16 insertions, 10 deletions

diff --git a/sshkey.c b/sshkey.c
index 1ac32a0ec..b88282e19 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.108 2020/04/11 10:16:11 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.111 2020/08/27 01:06:19 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -132,6 +132,8 @@ static const struct keytype keytypes[] = {
 #  endif /* OPENSSL_HAS_NISTP521 */
         { "sk-ecdsa-sha2-nistp256@openssh.com", "ECDSA-SK", NULL,
             KEY_ECDSA_SK, NID_X9_62_prime256v1, 0, 0 },
+        { "webauthn-sk-ecdsa-sha2-nistp256@openssh.com", "ECDSA-SK", NULL,
+            KEY_ECDSA_SK, NID_X9_62_prime256v1, 0, 1 },
 # endif /* OPENSSL_HAS_ECC */
         { "ssh-rsa-cert-v01@openssh.com", "RSA-CERT", NULL,
             KEY_RSA_CERT, 0, 1, 0 },
@@ -2726,7 +2728,7 @@ int
 sshkey_sign(struct sshkey *key,
     u_char **sigp, size_t *lenp,
     const u_char *data, size_t datalen,
-    const char *alg, const char *sk_provider, u_int compat)
+    const char *alg, const char *sk_provider, const char *sk_pin, u_int compat)
 {
         int was_shielded = sshkey_is_shielded(key);
         int r2, r = SSH_ERR_INTERNAL_ERROR;
@@ -2765,7 +2767,7 @@ sshkey_sign(struct sshkey *key,
         case KEY_ECDSA_SK_CERT:
         case KEY_ECDSA_SK:
                 r = sshsk_sign(sk_provider, key, sigp, lenp, data,
-                    datalen, compat, /* XXX PIN */ NULL);
+                    datalen, compat, sk_pin);
                 break;
 #ifdef WITH_XMSS
         case KEY_XMSS:
@@ -2887,7 +2889,8 @@ sshkey_drop_cert(struct sshkey *k)
 /* Sign a certified key, (re-)generating the signed certblob. */
 int
 sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
-    const char *sk_provider, sshkey_certify_signer *signer, void *signer_ctx)
+    const char *sk_provider, const char *sk_pin,
+    sshkey_certify_signer *signer, void *signer_ctx)
 {
         struct sshbuf *principals = NULL;
         u_char *ca_blob = NULL, *sig_blob = NULL, nonce[32];
@@ -3025,7 +3028,7 @@ sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
 
         /* Sign the whole mess */
         if ((ret = signer(ca, &sig_blob, &sig_len, sshbuf_ptr(cert),
-            sshbuf_len(cert), alg, sk_provider, 0, signer_ctx)) != 0)
+            sshbuf_len(cert), alg, sk_provider, sk_pin, 0, signer_ctx)) != 0)
                 goto out;
         /* Check and update signature_type against what was actually used */
         if ((ret = sshkey_get_sigtype(sig_blob, sig_len, &sigtype)) != 0)
@@ -3055,19 +3058,20 @@ sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
 static int
 default_key_sign(struct sshkey *key, u_char **sigp, size_t *lenp,
     const u_char *data, size_t datalen,
-    const char *alg, const char *sk_provider, u_int compat, void *ctx)
+    const char *alg, const char *sk_provider, const char *sk_pin,
+    u_int compat, void *ctx)
 {
         if (ctx != NULL)
                 return SSH_ERR_INVALID_ARGUMENT;
         return sshkey_sign(key, sigp, lenp, data, datalen, alg,
-            sk_provider, compat);
+            sk_provider, sk_pin, compat);
 }
 
 int
 sshkey_certify(struct sshkey *k, struct sshkey *ca, const char *alg,
-    const char *sk_provider)
+    const char *sk_provider, const char *sk_pin)
 {
-        return sshkey_certify_custom(k, ca, alg, sk_provider,
+        return sshkey_certify_custom(k, ca, alg, sk_provider, sk_pin,
             default_key_sign, NULL);
 }
 
@@ -3599,10 +3603,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;