aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-09-14 16:13:00 -0400
committerRich Salz <rsalz@openssl.org>2017-09-14 16:13:29 -0400
commit6807b84eacc89aee6eed2730e7dd3ce7171cc834 (patch)
treef5d5b858bb31aa5ff8f1186b8b604d47175be44a /crypto
parentf5d270cab5021047cd88b71b92243141912f3906 (diff)
downloadopenssl-6807b84eacc89aee6eed2730e7dd3ce7171cc834.zip
openssl-6807b84eacc89aee6eed2730e7dd3ce7171cc834.tar.gz
openssl-6807b84eacc89aee6eed2730e7dd3ce7171cc834.tar.bz2
Fix function name in ECerr call
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4371)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/ec/ec_ameth.c2
-rw-r--r--crypto/ec/ec_err.c1
-rw-r--r--crypto/err/openssl.txt1
3 files changed, 3 insertions, 1 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index ecf1a02..22ad6b0 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 0097825..19a7a9d 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 b05d459..11a1365 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