From: Shane Lontis Date: Wed, 24 Apr 2019 00:06:54 +0000 (+1000) Subject: Added generated files for EVP_KDF changes X-Git-Tag: openssl-3.0.0-alpha1~2100 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=ff8029c189786196c010292b647f3bca6d51e91d;hp=d2ba812343a62b1f86a15ae09bdeafec6d82f43a Added generated files for EVP_KDF changes Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/8808) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 225fe218a6..8ad85f5025 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -802,6 +802,7 @@ EVP_F_EVP_ENCRYPTFINAL_EX:127:EVP_EncryptFinal_ex EVP_F_EVP_ENCRYPTUPDATE:167:EVP_EncryptUpdate EVP_F_EVP_KDF_CTRL:224:EVP_KDF_ctrl EVP_F_EVP_KDF_CTRL_STR:225:EVP_KDF_ctrl_str +EVP_F_EVP_KDF_CTX_NEW:240:EVP_KDF_CTX_new EVP_F_EVP_KDF_CTX_NEW_ID:226:EVP_KDF_CTX_new_id EVP_F_EVP_MAC_CTRL:209:EVP_MAC_ctrl EVP_F_EVP_MAC_CTRL_STR:210:EVP_MAC_ctrl_str diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index 3555c0e5f8..703d1728fc 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -74,6 +74,7 @@ static const ERR_STRING_DATA EVP_str_functs[] = { {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_ENCRYPTUPDATE, 0), "EVP_EncryptUpdate"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_KDF_CTRL, 0), "EVP_KDF_ctrl"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_KDF_CTRL_STR, 0), "EVP_KDF_ctrl_str"}, + {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_KDF_CTX_NEW, 0), "EVP_KDF_CTX_new"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_KDF_CTX_NEW_ID, 0), "EVP_KDF_CTX_new_id"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTRL, 0), "EVP_MAC_ctrl"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_MAC_CTRL_STR, 0), "EVP_MAC_ctrl_str"}, diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index d88d4a8403..ba95fd2f6d 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -70,6 +70,7 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_ENCRYPTUPDATE 167 # define EVP_F_EVP_KDF_CTRL 224 # define EVP_F_EVP_KDF_CTRL_STR 225 +# define EVP_F_EVP_KDF_CTX_NEW 240 # define EVP_F_EVP_KDF_CTX_NEW_ID 226 # define EVP_F_EVP_MAC_CTRL 209 # define EVP_F_EVP_MAC_CTRL_STR 210 diff --git a/util/libcrypto.num b/util/libcrypto.num index 8259ddbb5e..010f8686d5 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4800,3 +4800,7 @@ EVP_CIPHER_upref 4747 3_0_0 EXIST::FUNCTION: EVP_CIPHER_fetch 4748 3_0_0 EXIST::FUNCTION: EVP_CIPHER_mode 4749 3_0_0 EXIST::FUNCTION: OPENSSL_info 4750 3_0_0 EXIST::FUNCTION: +EVP_KDF_CTX_new 4751 3_0_0 EXIST::FUNCTION: +EVP_KDF_CTX_kdf 4752 3_0_0 EXIST::FUNCTION: +EVP_KDF_nid 4753 3_0_0 EXIST::FUNCTION: +EVP_get_kdfbyname 4754 3_0_0 EXIST::FUNCTION: