From 6807b84eacc89aee6eed2730e7dd3ce7171cc834 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 14 Sep 2017 16:13:00 -0400 Subject: [PATCH] Fix function name in ECerr call Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/4371) --- crypto/ec/ec_ameth.c | 2 +- crypto/ec/ec_err.c | 1 + crypto/err/openssl.txt | 1 + include/openssl/ecerr.h | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index ecf1a0207d..22ad6b0f2d 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -526,7 +526,7 @@ static int ec_pkey_check(const EVP_PKEY *pkey) /* stay consistent to what EVP_PKEY_check demands */ if (eckey->priv_key == NULL) { - ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_MISSING_PRIVATE_KEY); + ECerr(EC_F_EC_PKEY_CHECK, EC_R_MISSING_PRIVATE_KEY); return 0; } diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c index 0097825f10..19a7a9d7bd 100644 --- a/crypto/ec/ec_err.c +++ b/crypto/ec/ec_err.c @@ -181,6 +181,7 @@ static const ERR_STRING_DATA EC_str_functs[] = { "ec_key_simple_oct2priv"}, {ERR_PACK(ERR_LIB_EC, EC_F_EC_KEY_SIMPLE_PRIV2OCT, 0), "ec_key_simple_priv2oct"}, + {ERR_PACK(ERR_LIB_EC, EC_F_EC_PKEY_CHECK, 0), "ec_pkey_check"}, {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINTS_MAKE_AFFINE, 0), "EC_POINTs_make_affine"}, {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_ADD, 0), "EC_POINT_add"}, diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index b05d4599af..11a1365f72 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -539,6 +539,7 @@ EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES:229:\ EC_F_EC_KEY_SIMPLE_CHECK_KEY:258:ec_key_simple_check_key EC_F_EC_KEY_SIMPLE_OCT2PRIV:259:ec_key_simple_oct2priv EC_F_EC_KEY_SIMPLE_PRIV2OCT:260:ec_key_simple_priv2oct +EC_F_EC_PKEY_CHECK:273:ec_pkey_check EC_F_EC_POINTS_MAKE_AFFINE:136:EC_POINTs_make_affine EC_F_EC_POINT_ADD:112:EC_POINT_add EC_F_EC_POINT_CMP:113:EC_POINT_cmp diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h index 55caec4ad1..b04599a8b3 100644 --- a/include/openssl/ecerr.h +++ b/include/openssl/ecerr.h @@ -125,6 +125,7 @@ int ERR_load_EC_strings(void); # define EC_F_EC_KEY_SIMPLE_CHECK_KEY 258 # define EC_F_EC_KEY_SIMPLE_OCT2PRIV 259 # define EC_F_EC_KEY_SIMPLE_PRIV2OCT 260 +# define EC_F_EC_PKEY_CHECK 273 # define EC_F_EC_POINTS_MAKE_AFFINE 136 # define EC_F_EC_POINT_ADD 112 # define EC_F_EC_POINT_CMP 113 -- 2.25.1