diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/openpgp-oid.c | 16 | ||||
| -rw-r--r-- | common/util.h | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c index 270bdf154..e7c68f290 100644 --- a/common/openpgp-oid.c +++ b/common/openpgp-oid.c @@ -411,17 +411,21 @@ openpgp_enum_curves (int *iterp) } -/* Return the Libgcrypt name for for the gpg curve NAME if supported. - * If R_ALGO is not NULL the required OpenPGP public key algo or 0 is - * stored at that address. NULL is returned if the curev is not - * supported. */ +/* Return the Libgcrypt name for the gpg curve NAME if supported. If + * R_ALGO is not NULL the required OpenPGP public key algo or 0 is + * stored at that address. If R_NBITS is not NULL the nominal bitsize + * of the curves is stored there. NULL is returned if the curve is + * not supported. */ const char * -openpgp_is_curve_supported (const char *name, int *r_algo) +openpgp_is_curve_supported (const char *name, int *r_algo, + unsigned int *r_nbits) { int idx; if (r_algo) *r_algo = 0; + if (r_nbits) + *r_nbits = 0; for (idx = 0; idx < DIM (oidtable) && oidtable[idx].name; idx++) { if ((!strcmp (name, oidtable[idx].name) @@ -430,6 +434,8 @@ openpgp_is_curve_supported (const char *name, int *r_algo) { if (r_algo) *r_algo = oidtable[idx].pubkey_algo; + if (r_nbits) + *r_nbits = oidtable[idx].nbits; return oidtable[idx].name; } } diff --git a/common/util.h b/common/util.h index 2f82fb09b..6e437b984 100644 --- a/common/util.h +++ b/common/util.h @@ -39,6 +39,9 @@ * libgpg-error version. Define them here. * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21) */ +#if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */ +# define GPG_ERR_UNKNOWN_FLAG 309 +#endif /* Hash function used with libksba. */ @@ -210,7 +213,8 @@ int openpgp_oid_is_cv25519 (gcry_mpi_t a); const char *openpgp_curve_to_oid (const char *name, unsigned int *r_nbits); const char *openpgp_oid_to_curve (const char *oid, int canon); const char *openpgp_enum_curves (int *idxp); -const char *openpgp_is_curve_supported (const char *name, int *r_algo); +const char *openpgp_is_curve_supported (const char *name, + int *r_algo, unsigned int *r_nbits); /*-- homedir.c --*/ |