diff options
| author | NIIBE Yutaka <[email protected]> | 2021-10-22 06:00:47 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2021-10-22 06:00:47 +0000 |
| commit | 0d74c3c89663ee9b163742c6c75641c1b6b28f09 (patch) | |
| tree | cefba030ff71ef369c87be420d1babf7c549007e | |
| parent | experiment: Fix keygrip and signature for 448. (diff) | |
| download | gnupg-0d74c3c89663ee9b163742c6c75641c1b6b28f09.tar.gz gnupg-0d74c3c89663ee9b163742c6c75641c1b6b28f09.zip | |
experiment: Support importing new 448 secret keys.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | g10/import.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/g10/import.c b/g10/import.c index bb0bf6793..f9c0cc27c 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2493,6 +2493,9 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, main_pk = NULL; while ((node = walk_kbnode (sec_keyblock, &ctx, 0))) { + gcry_mpi_t ecc_pubkey = NULL; + gcry_mpi_t ecc_seckey = NULL; + if (node->pkt->pkttype != PKT_SECRET_KEY && node->pkt->pkttype != PKT_SECRET_SUBKEY) continue; @@ -2571,7 +2574,9 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, j = 0; /* Append the public key element Q. */ put_membuf_str (&mbuf, " _ %m"); - format_args[j++] = pk->pkey + 1; + ecc_pubkey = openpgp_ecc_parse_key (pk->pubkey_algo, + curvename, pk->pkey[1]); + format_args[j++] = &ecc_pubkey; /* Append the secret key element D. For ECDH we skip PKEY[2] because this holds the KEK which is @@ -2581,7 +2586,9 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, put_membuf_str (&mbuf, " e %m"); else put_membuf_str (&mbuf, " _ %m"); - format_args[j++] = pk->pkey + i; + ecc_seckey = openpgp_ecc_parse_key (pk->pubkey_algo, + curvename, pk->pkey[i]); + format_args[j++] = &ecc_seckey; /* Simple hack to print a warning for an invalid key * in case of cv25519. We have only opaque MPIs here. */ @@ -2630,6 +2637,8 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, err = gcry_sexp_build_array (&skey, NULL, format, format_args); xfree (format); } + gcry_mpi_release (ecc_pubkey); + gcry_mpi_release (ecc_seckey); if (err) { log_error ("error building skey array: %s\n", gpg_strerror (err)); |