src/usr.bin/ssh/ssh-xmss.c - diff

Return to ssh-xmss.c CVS log

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

Diff for /src/usr.bin/ssh/ssh-xmss.c between version 1.13 and 1.14

-version 1.13, 2022/10/28 00:44:17
+version 1.14, 2022/10/28 00:44:44
 Line 156
 Line 156
 Line 156
  }
  static int
+ ssh_xmss_deserialize_private(const char *ktype, struct sshbuf *b,
+     struct sshkey *key)
+ {
+         int r;
+         char *xmss_name = NULL;
+         size_t pklen = 0, sklen = 0;
+         u_char *xmss_pk = NULL, *xmss_sk = NULL;
+         /* Note: can't reuse ssh_xmss_deserialize_public because of sk order */
+         if ((r = sshbuf_get_cstring(b, &xmss_name, NULL)) != 0 ||
+             (r = sshbuf_get_string(b, &xmss_pk, &pklen)) != 0 ||
+             (r = sshbuf_get_string(b, &xmss_sk, &sklen)) != 0)
+                 goto out;
+         if (!sshkey_is_cert(key) &&
+             (r = sshkey_xmss_init(key, xmss_name)) != 0)
+                 goto out;
+         if (pklen != sshkey_xmss_pklen(key) ||
+             sklen != sshkey_xmss_sklen(key)) {
+                 r = SSH_ERR_INVALID_FORMAT;
+                 goto out;
+         }
+         key->xmss_pk = xmss_pk;
+         key->xmss_sk = xmss_sk;
+         xmss_pk = xmss_sk = NULL;
+         /* optional internal state */
+         if ((r = sshkey_xmss_deserialize_state_opt(key, b)) != 0)
+                 goto out;
+         /* success */
+         r = 0;
+  out:
+         free(xmss_name);
+         freezero(xmss_pk, pklen);
+         freezero(xmss_sk, sklen);
+         return r;
+ }
+ static int
  ssh_xmss_sign(struct sshkey *key,
      u_char **sigp, size_t *lenp,
      const u_char *data, size_t datalen,
-Line 314
+Line 351
 Line 314
 Line 351
          /* .ssh_serialize_public = */ ssh_xmss_serialize_public,
          /* .ssh_deserialize_public = */ ssh_xmss_deserialize_public,
          /* .ssh_serialize_private = */ ssh_xmss_serialize_private,
+         /* .ssh_deserialize_private = */ ssh_xmss_deserialize_private,
          /* .generate = */       sshkey_xmss_generate_private_key,
          /* .copy_public = */    ssh_xmss_copy_public,
          /* .sign = */           ssh_xmss_sign,