From: Dr. Stephen Henson Date: Sat, 20 May 2017 02:08:20 +0000 (+0100) Subject: make errors X-Git-Tag: OpenSSL_1_1_1-pre1~1417 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca23d3e089f1b807bfa088f6d916b0aa55594717;p=oweals%2Fopenssl.git make errors Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3503) --- diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c index e4c2c1c1a4..46347977c3 100644 --- a/crypto/ec/ec_err.c +++ b/crypto/ec/ec_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -194,6 +194,8 @@ 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_ECD_CTRL), "pkey_ecd_ctrl"}, + {ERR_FUNC(EC_F_PKEY_ECD_DIGESTSIGN), "pkey_ecd_digestsign"}, {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"}, diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 0562dd307f..c1a4a6b3fc 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -1507,6 +1507,8 @@ 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_ECD_CTRL 270 +# define EC_F_PKEY_ECD_DIGESTSIGN 271 # define EC_F_PKEY_ECX_DERIVE 269 # define EC_F_PKEY_EC_CTRL 197 # define EC_F_PKEY_EC_CTRL_STR 198