From 59bf0f031fdbf8cb2f5371e6f32478e1bb05bd78 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 10 Aug 2016 16:27:22 +0100 Subject: [PATCH] make errors Reviewed-by: Rich Salz --- crypto/ec/ec_err.c | 6 ++++++ include/openssl/ec.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c index 39e8343623..e4c2c1c1a4 100644 --- a/crypto/ec/ec_err.c +++ b/crypto/ec/ec_err.c @@ -51,6 +51,9 @@ static ERR_STRING_DATA EC_str_functs[] = { {ERR_FUNC(EC_F_ECP_NISTZ256_POINTS_MUL), "ecp_nistz256_points_mul"}, {ERR_FUNC(EC_F_ECP_NISTZ256_PRE_COMP_NEW), "ecp_nistz256_pre_comp_new"}, {ERR_FUNC(EC_F_ECP_NISTZ256_WINDOWED_MUL), "ecp_nistz256_windowed_mul"}, + {ERR_FUNC(EC_F_ECX_KEY_OP), "ecx_key_op"}, + {ERR_FUNC(EC_F_ECX_PRIV_ENCODE), "ecx_priv_encode"}, + {ERR_FUNC(EC_F_ECX_PUB_ENCODE), "ecx_pub_encode"}, {ERR_FUNC(EC_F_EC_ASN1_GROUP2CURVE), "ec_asn1_group2curve"}, {ERR_FUNC(EC_F_EC_ASN1_GROUP2FIELDID), "ec_asn1_group2fieldid"}, {ERR_FUNC(EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY), @@ -191,6 +194,7 @@ static ERR_STRING_DATA EC_str_functs[] = { {ERR_FUNC(EC_F_OSSL_ECDH_COMPUTE_KEY), "ossl_ecdh_compute_key"}, {ERR_FUNC(EC_F_OSSL_ECDSA_SIGN_SIG), "ossl_ecdsa_sign_sig"}, {ERR_FUNC(EC_F_OSSL_ECDSA_VERIFY_SIG), "ossl_ecdsa_verify_sig"}, + {ERR_FUNC(EC_F_PKEY_ECX_DERIVE), "pkey_ecx_derive"}, {ERR_FUNC(EC_F_PKEY_EC_CTRL), "pkey_ec_ctrl"}, {ERR_FUNC(EC_F_PKEY_EC_CTRL_STR), "pkey_ec_ctrl_str"}, {ERR_FUNC(EC_F_PKEY_EC_DERIVE), "pkey_ec_derive"}, @@ -233,7 +237,9 @@ static ERR_STRING_DATA EC_str_reasons[] = { {ERR_REASON(EC_R_INVALID_FIELD), "invalid field"}, {ERR_REASON(EC_R_INVALID_FORM), "invalid form"}, {ERR_REASON(EC_R_INVALID_GROUP_ORDER), "invalid group order"}, + {ERR_REASON(EC_R_INVALID_KEY), "invalid key"}, {ERR_REASON(EC_R_INVALID_OUTPUT_LENGTH), "invalid output length"}, + {ERR_REASON(EC_R_INVALID_PEER_KEY), "invalid peer key"}, {ERR_REASON(EC_R_INVALID_PENTANOMIAL_BASIS), "invalid pentanomial basis"}, {ERR_REASON(EC_R_INVALID_PRIVATE_KEY), "invalid private key"}, {ERR_REASON(EC_R_INVALID_TRINOMIAL_BASIS), "invalid trinomial basis"}, diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 9db239751f..4a8b832756 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -1396,6 +1396,9 @@ int ERR_load_EC_strings(void); # define EC_F_ECP_NISTZ256_POINTS_MUL 241 # define EC_F_ECP_NISTZ256_PRE_COMP_NEW 244 # define EC_F_ECP_NISTZ256_WINDOWED_MUL 242 +# define EC_F_ECX_KEY_OP 266 +# define EC_F_ECX_PRIV_ENCODE 267 +# define EC_F_ECX_PUB_ENCODE 268 # define EC_F_EC_ASN1_GROUP2CURVE 153 # define EC_F_EC_ASN1_GROUP2FIELDID 154 # define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY 208 @@ -1500,6 +1503,7 @@ int ERR_load_EC_strings(void); # define EC_F_OSSL_ECDH_COMPUTE_KEY 247 # define EC_F_OSSL_ECDSA_SIGN_SIG 249 # define EC_F_OSSL_ECDSA_VERIFY_SIG 250 +# define EC_F_PKEY_ECX_DERIVE 269 # define EC_F_PKEY_EC_CTRL 197 # define EC_F_PKEY_EC_CTRL_STR 198 # define EC_F_PKEY_EC_DERIVE 217 @@ -1534,7 +1538,9 @@ int ERR_load_EC_strings(void); # define EC_R_INVALID_FIELD 103 # define EC_R_INVALID_FORM 104 # define EC_R_INVALID_GROUP_ORDER 122 +# define EC_R_INVALID_KEY 116 # define EC_R_INVALID_OUTPUT_LENGTH 161 +# define EC_R_INVALID_PEER_KEY 133 # define EC_R_INVALID_PENTANOMIAL_BASIS 132 # define EC_R_INVALID_PRIVATE_KEY 123 # define EC_R_INVALID_TRINOMIAL_BASIS 137 -- 2.25.1