Commit ff8029c1 authored by Shane Lontis's avatar Shane Lontis Committed by Richard Levitte
Browse files

Added generated files for EVP_KDF changes 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8808)
parent d2ba8123

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

crypto/evp/evp_err.c

+1 −0
Original line number Diff line number Diff line
@@ -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"},

include/openssl/evperr.h

+1 −0
Original line number Diff line number Diff line
@@ -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

util/libcrypto.num

+4 −0
Original line number Diff line number Diff line
@@ -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: