diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/openpgp-oid.c | 8 | ||||
| -rw-r--r-- | common/util.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c index 7c9354708..af3cbbe1a 100644 --- a/common/openpgp-oid.c +++ b/common/openpgp-oid.c @@ -68,7 +68,7 @@ static const char oid_ed25519[] = { 0x09, 0x2b, 0x06, 0x01, 0x04, 0x01, 0xda, 0x47, 0x0f, 0x01 }; /* The OID for Curve25519 in OpenPGP format. */ -static const char oid_crv25519[] = +static const char oid_cv25519[] = { 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x97, 0x55, 0x01, 0x05, 0x01 }; @@ -298,7 +298,7 @@ openpgp_oid_is_ed25519 (gcry_mpi_t a) int -openpgp_oid_is_crv25519 (gcry_mpi_t a) +openpgp_oid_is_cv25519 (gcry_mpi_t a) { const unsigned char *buf; unsigned int nbits; @@ -309,8 +309,8 @@ openpgp_oid_is_crv25519 (gcry_mpi_t a) buf = gcry_mpi_get_opaque (a, &nbits); n = (nbits+7)/8; - return (n == DIM (oid_crv25519) - && !memcmp (buf, oid_crv25519, DIM (oid_crv25519))); + return (n == DIM (oid_cv25519) + && !memcmp (buf, oid_cv25519, DIM (oid_cv25519))); } diff --git a/common/util.h b/common/util.h index 1c3cce9a8..f293234e0 100644 --- a/common/util.h +++ b/common/util.h @@ -206,7 +206,7 @@ size_t percent_unescape_inplace (char *string, int nulrepl); gpg_error_t openpgp_oid_from_str (const char *string, gcry_mpi_t *r_mpi); char *openpgp_oid_to_str (gcry_mpi_t a); int openpgp_oid_is_ed25519 (gcry_mpi_t a); -int openpgp_oid_is_crv25519 (gcry_mpi_t a); +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); |