diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/keyid.c | 4 | ||||
| -rw-r--r-- | g10/misc.c | 3 | ||||
| -rw-r--r-- | g10/pkglue.c | 12 |
3 files changed, 9 insertions, 10 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index d0a3e4057..8264fe9d6 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -1068,8 +1068,8 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array) err = gpg_error_from_syserror (); else { - gcry_mpi_t pubkey = openpgp_ecc_parse_pubkey (pk->pubkey_algo, - curve, pk->pkey[1]); + gcry_mpi_t pubkey = openpgp_ecc_parse_key (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 e83800a85..786ae52cf 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1806,8 +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_pubkey (algo, - curve_name, key[1]); + gcry_mpi_t pubkey = openpgp_ecc_parse_key (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 bc6f30e94..9a1db3bc8 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_pubkey (pkalgo, curve_name, pkey[1]); + pubkey = openpgp_ecc_parse_key (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_pubkey (algo, curve_name, pkey[1]); + pubkey = openpgp_ecc_parse_key (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 ? @@ -543,8 +543,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_pubkey (pkalgo, curve_name, skey[1]); - seckey = openpgp_ecc_parse_seckey (pkalgo, curve_name, skey[2]); + pubkey = openpgp_ecc_parse_key (pkalgo, curve_name, skey[1]); + seckey = openpgp_ecc_parse_key (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); @@ -565,8 +565,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_pubkey (pkalgo, curve_name, skey[1]); - seckey = openpgp_ecc_parse_seckey (pkalgo, curve_name, skey[2]); + pubkey = openpgp_ecc_parse_key (pkalgo, curve_name, skey[1]); + seckey = openpgp_ecc_parse_key (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 |