src/usr.bin/ssh/ssh-ecdsa-sk.c - diff

Return to ssh-ecdsa-sk.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-ecdsa-sk.c between version 1.8 and 1.9

-version 1.8, 2020/06/22 23:44:27
+version 1.9, 2022/10/28 00:35:40
 Line 43
 Line 43
 Line 43
  #define SSHKEY_INTERNAL
  #include "sshkey.h"
+ static void
+ ssh_ecdsa_sk_cleanup(struct sshkey *k)
+ {
+         free(k->sk_application);
+         sshbuf_free(k->sk_key_handle);
+         sshbuf_free(k->sk_reserved);
+         EC_KEY_free(k->ecdsa);
+         k->ecdsa = NULL;
+ }
  /*
   * Check FIDO/W3C webauthn signatures clientData field against the expected
   * format and prepare a hash of it for use in signature verification.
-Line 302
+Line 312
 Line 302
 Line 312
          free(ktype);
          return ret;
  }
+ static const struct sshkey_impl_funcs sshkey_ecdsa_sk_funcs = {
+         /* .size = */           NULL,
+         /* .alloc = */          NULL,
+         /* .cleanup = */        ssh_ecdsa_sk_cleanup,
+ };
+ const struct sshkey_impl sshkey_ecdsa_sk_impl = {
+         /* .name = */           "sk-ecdsa-sha2-nistp256@openssh.com",
+         /* .shortname = */      "ECDSA-SK",
+         /* .sigalg = */         NULL,
+         /* .type = */           KEY_ECDSA_SK,
+         /* .nid = */            NID_X9_62_prime256v1,
+         /* .cert = */           0,
+         /* .sigonly = */        0,
+         /* .keybits = */        256,
+         /* .funcs = */          &sshkey_ecdsa_sk_funcs,
+ };
+ const struct sshkey_impl sshkey_ecdsa_sk_cert_impl = {
+         /* .name = */           "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com",
+         /* .shortname = */      "ECDSA-SK-CERT",
+         /* .sigalg = */         NULL,
+         /* .type = */           KEY_ECDSA_SK_CERT,
+         /* .nid = */            NID_X9_62_prime256v1,
+         /* .cert = */           1,
+         /* .sigonly = */        0,
+         /* .keybits = */        256,
+         /* .funcs = */          &sshkey_ecdsa_sk_funcs,
+ };
+ const struct sshkey_impl sshkey_ecdsa_sk_webauthn_impl = {
+         /* .name = */           "webauthn-sk-ecdsa-sha2-nistp256@openssh.com",
+         /* .shortname = */      "ECDSA-SK",
+         /* .sigalg = */         NULL,
+         /* .type = */           KEY_ECDSA_SK,
+         /* .nid = */            NID_X9_62_prime256v1,
+         /* .cert = */           0,
+         /* .sigonly = */        1,
+         /* .keybits = */        256,
+         /* .funcs = */          &sshkey_ecdsa_sk_funcs,
+ };