diff options
Diffstat (limited to 'common/openpgp-misc.c')
| -rw-r--r-- | common/openpgp-misc.c | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/common/openpgp-misc.c b/common/openpgp-misc.c index 2caad9093..178a4938e 100644 --- a/common/openpgp-misc.c +++ b/common/openpgp-misc.c @@ -23,45 +23,28 @@ #include "util.h" #include "openpgpdefs.h" +/* + * Parse the key (pubkey or seckey), and return real version of the + * key; That is, for Ed448/X448, return key with prefix removed. + */ gcry_mpi_t -openpgp_ecc_parse_pubkey (pubkey_algo_t pkalgo, const char *curve, - gcry_mpi_t pubkey) -{ - unsigned int nbits = 0; - unsigned char *buf = NULL; - - if ((pkalgo == PUBKEY_ALGO_EDDSA && !strcmp (curve, "Ed448")) - || (pkalgo == PUBKEY_ALGO_ECDH && !strcmp (curve, "X448"))) - buf = gcry_mpi_get_opaque (pubkey, &nbits); - - if (nbits == 0 - || (pkalgo == PUBKEY_ALGO_EDDSA && (nbits+7)/8 == (448 + 8)/8) - || (pkalgo == PUBKEY_ALGO_ECDH && (nbits+7)/8 == 448/8)) - return gcry_mpi_copy (pubkey); - - if (pkalgo == PUBKEY_ALGO_EDDSA) - return gcry_mpi_set_opaque_copy (NULL, buf+1, 8 + 448); - else - return gcry_mpi_set_opaque_copy (NULL, buf+1, 448); -} - - -gcry_mpi_t -openpgp_ecc_parse_seckey (pubkey_algo_t pkalgo, const char *curve, - gcry_mpi_t seckey) +openpgp_ecc_parse_key (pubkey_algo_t pkalgo, const char *curve, + gcry_mpi_t key) { unsigned int nbits = 0; unsigned char *buf = NULL; if ((pkalgo == PUBKEY_ALGO_EDDSA && !strcmp (curve, "Ed448")) || (pkalgo == PUBKEY_ALGO_ECDH && !strcmp (curve, "X448"))) - buf = gcry_mpi_get_opaque (seckey, &nbits); + buf = gcry_mpi_get_opaque (key, &nbits); + /* Either Ed448/X448 non-prefixed or not Ed448/X448. */ if (nbits == 0 || (pkalgo == PUBKEY_ALGO_EDDSA && (nbits+7)/8 == (448 + 8)/8) || (pkalgo == PUBKEY_ALGO_ECDH && (nbits+7)/8 == 448/8)) - return gcry_mpi_copy (seckey); + return gcry_mpi_copy (key); + /* Ed448 or X448 prefixed. */ if (pkalgo == PUBKEY_ALGO_EDDSA) return gcry_mpi_set_opaque_copy (NULL, buf+1, 8 + 448); else |