diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/export.c | 6 | ||||
| -rw-r--r-- | g10/import.c | 4 | ||||
| -rw-r--r-- | g10/keygen.c | 2 | ||||
| -rw-r--r-- | g10/keyid.c | 4 | ||||
| -rw-r--r-- | g10/misc.c | 2 | ||||
| -rw-r--r-- | g10/pkglue.c | 14 |
6 files changed, 16 insertions, 16 deletions
diff --git a/g10/export.c b/g10/export.c index faec87c1b..3327d69ea 100644 --- a/g10/export.c +++ b/g10/export.c @@ -760,7 +760,7 @@ cleartext_secret_key_to_openpgp (gcry_sexp_t s_key, PKT_public_key *pk) err = sexp_extract_param_sos (key, "q", &pub_params[0]); if (!err && is_448) - err = openpgp_fixup_key_448 (pk->pubkey_algo, &pub_params[0]); + err = openpgp_from_libgcrypt (pk->pubkey_algo, &pub_params[0]); if (!err && (gcry_mpi_cmp(pk->pkey[1], pub_params[0]))) err = gpg_error (GPG_ERR_BAD_PUBKEY); @@ -774,8 +774,8 @@ cleartext_secret_key_to_openpgp (gcry_sexp_t s_key, PKT_public_key *pk) pk->pkey[sec_start] = NULL; err = sexp_extract_param_sos (key, "d", &pk->pkey[sec_start]); if (!err && is_448) - err = openpgp_fixup_key_448 (pk->pubkey_algo, - &pk->pkey[sec_start]); + err = openpgp_from_libgcrypt (pk->pubkey_algo, + &pk->pkey[sec_start]); } if (!err) diff --git a/g10/import.c b/g10/import.c index 02e7d1007..43eb76ece 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2573,8 +2573,8 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, j = 0; /* Append the public key element Q. */ put_membuf_str (&mbuf, " _ %m"); - ecc_pubkey = openpgp_ecc_parse_key (pk->pubkey_algo, - curvename, pk->pkey[1]); + ecc_pubkey = openpgp_to_libgcrypt (pk->pubkey_algo, + curvename, pk->pkey[1]); format_args[j++] = &ecc_pubkey; /* Append the secret key element D. For ECDH we diff --git a/g10/keygen.c b/g10/keygen.c index b07d878aa..a63487c53 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1338,7 +1338,7 @@ ecckey_from_sexp (gcry_mpi_t *array, gcry_sexp_t sexp, int algo) if (openpgp_oid_is_ed448 (array[0]) || openpgp_oid_is_cv448 (array[0])) { - err = openpgp_fixup_key_448 (algo, &array[1]); + err = openpgp_from_libgcrypt (algo, &array[1]); if (err) goto leave; } diff --git a/g10/keyid.c b/g10/keyid.c index e365b84f0..cd12b27f7 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -1069,8 +1069,8 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array) else { const char *curve = openpgp_oid_to_curve (curve_oid, 1); - gcry_mpi_t pubkey = openpgp_ecc_parse_key (pk->pubkey_algo, - curve, pk->pkey[1]); + gcry_mpi_t pubkey = openpgp_to_libgcrypt (pk->pubkey_algo, + curve, pk->pkey[1]); err = gcry_sexp_build (&s_pkey, NULL, pk->pubkey_algo == PUBKEY_ALGO_EDDSA? diff --git a/g10/misc.c b/g10/misc.c index 786ae52cf..8e1dbd927 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1806,7 +1806,7 @@ pubkey_nbits( int algo, gcry_mpi_t *key ) else { const char *curve_name = openpgp_oid_to_curve (curve, 1); - gcry_mpi_t pubkey = openpgp_ecc_parse_key (algo, curve_name, key[1]); + gcry_mpi_t pubkey = openpgp_to_libgcrypt (algo, curve_name, key[1]); rc = gcry_sexp_build (&sexp, NULL, "(public-key(ecc(curve%s)(q%m)))", diff --git a/g10/pkglue.c b/g10/pkglue.c index ab77aa916..b2f3b084f 100644 --- a/g10/pkglue.c +++ b/g10/pkglue.c @@ -194,7 +194,7 @@ pk_verify (pubkey_algo_t pkalgo, gcry_mpi_t hash, gcry_mpi_t pubkey; const char *curve_name = openpgp_oid_to_curve (curve, 1); - pubkey = openpgp_ecc_parse_key (pkalgo, curve_name, pkey[1]); + pubkey = openpgp_to_libgcrypt (pkalgo, curve_name, pkey[1]); if (openpgp_oid_is_ed25519 (pkey[0])) fmt = "(public-key(ecc(curve %s)(flags eddsa)(q%m)))"; else @@ -418,7 +418,7 @@ pk_encrypt (pubkey_algo_t algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t pubkey; const char *curve_name = openpgp_oid_to_curve (curve, 1); - pubkey = openpgp_ecc_parse_key (algo, curve_name, pkey[1]); + pubkey = openpgp_to_libgcrypt (algo, curve_name, pkey[1]); /* Now use the ephemeral secret to compute the shared point. */ rc = gcry_sexp_build (&s_pkey, NULL, with_djb_tweak_flag ? @@ -465,7 +465,7 @@ pk_encrypt (pubkey_algo_t algo, gcry_mpi_t *resarr, gcry_mpi_t data, s_ciph = NULL; if (openpgp_oid_is_cv448 (pkey[0])) { - rc = openpgp_fixup_key_448 (algo, &public); + rc = openpgp_from_libgcrypt (algo, &public); if (rc) goto leave; } @@ -550,8 +550,8 @@ pk_check_secret_key (pubkey_algo_t pkalgo, gcry_mpi_t *skey) gcry_mpi_t seckey; const char *curve_name = openpgp_oid_to_curve (curve, 1); - pubkey = openpgp_ecc_parse_key (pkalgo, curve_name, skey[1]); - seckey = openpgp_ecc_parse_key (pkalgo, curve_name, skey[2]); + pubkey = openpgp_to_libgcrypt (pkalgo, curve_name, skey[1]); + seckey = openpgp_to_libgcrypt (pkalgo, curve_name, skey[2]); rc = gcry_sexp_build (&s_skey, NULL, "(private-key(ecc(curve%s)(q%m)(d%m)))", curve_name, pubkey, seckey); @@ -572,8 +572,8 @@ pk_check_secret_key (pubkey_algo_t pkalgo, gcry_mpi_t *skey) gcry_mpi_t seckey; const char *curve_name = openpgp_oid_to_curve (curve, 1); - pubkey = openpgp_ecc_parse_key (pkalgo, curve_name, skey[1]); - seckey = openpgp_ecc_parse_key (pkalgo, curve_name, skey[2]); + pubkey = openpgp_to_libgcrypt (pkalgo, curve_name, skey[1]); + seckey = openpgp_to_libgcrypt (pkalgo, curve_name, skey[2]); if (openpgp_oid_is_ed25519 (skey[0])) fmt = "(private-key(ecc(curve %s)(flags eddsa)(q%m)(d%m)))"; else |