diff options
Diffstat (limited to 'common/openpgp-misc.c')
| -rw-r--r-- | common/openpgp-misc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/common/openpgp-misc.c b/common/openpgp-misc.c index 7c6c56a69..e8e33689c 100644 --- a/common/openpgp-misc.c +++ b/common/openpgp-misc.c @@ -8,15 +8,11 @@ #include "openpgpdefs.h" gcry_mpi_t -openpgp_ecc_parse_pubkey (pubkey_algo_t pkalgo, const char *curve_oid, +openpgp_ecc_parse_pubkey (pubkey_algo_t pkalgo, const char *curve, gcry_mpi_t pubkey) { unsigned int nbits = 0; unsigned char *buf = NULL; - const char *curve = openpgp_oid_to_curve (curve_oid, 1); - - if (curve == NULL) - curve = curve_oid; if ((pkalgo == PUBKEY_ALGO_EDDSA && !strcmp (curve, "Ed448")) || (pkalgo == PUBKEY_ALGO_ECDH && !strcmp (curve, "X448"))) @@ -35,15 +31,11 @@ openpgp_ecc_parse_pubkey (pubkey_algo_t pkalgo, const char *curve_oid, gcry_mpi_t -openpgp_ecc_parse_seckey (pubkey_algo_t pkalgo, const char *curve_oid, +openpgp_ecc_parse_seckey (pubkey_algo_t pkalgo, const char *curve, gcry_mpi_t seckey) { unsigned int nbits = 0; unsigned char *buf = NULL; - const char *curve = openpgp_oid_to_curve (curve_oid, 1); - - if (curve == NULL) - curve = curve_oid; if ((pkalgo == PUBKEY_ALGO_EDDSA && !strcmp (curve, "Ed448")) || (pkalgo == PUBKEY_ALGO_ECDH && !strcmp (curve, "X448"))) |