From 74a082bc10960b2d65d4d1e31152f988a40a2225 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 25 Aug 2016 15:16:32 +0200 Subject: common: Rename an odd named function. * common/openpgp-oid.c (oid_crv25519): Rename to oid_cv25519. (openpgp_oid_is_crv25519): Rename to openpgp_oid_is_cv25519. Change callers. -- We use "cv25519" everywhere else and thus the test function should not have a surprising name. Signed-off-by: Werner Koch --- common/openpgp-oid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'common/openpgp-oid.c') 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))); } -- cgit v1.2.3