Fix function name in ECerr call
authorRich Salz <rsalz@openssl.org>
Thu, 14 Sep 2017 20:13:00 +0000 (16:13 -0400)
committerRich Salz <rsalz@openssl.org>
Thu, 14 Sep 2017 20:13:29 +0000 (16:13 -0400)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4371)

crypto/ec/ec_ameth.c
crypto/ec/ec_err.c
crypto/err/openssl.txt
include/openssl/ecerr.h

index ecf1a02..22ad6b0 100644 (file)
@@ -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;
     }
 
index 0097825..19a7a9d 100644 (file)
@@ -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"},
index b05d459..11a1365 100644 (file)
@@ -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
index 55caec4..b04599a 100644 (file)
@@ -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