Added generated files for EVP_KDF changes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8808)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 225fe218a687ab5d89cc3f4171f84328a491b955..8ad85f502552b94410a008b5ce89269e0d6252d6 100644 (file)
--- 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 3555c0e5f8954c42216b51ca12e04ef1aea60f9b..703d1728fcbb694e9ef18aeaa2c2436efe0df13f 100644 (file)
--- 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 d88d4a8403e414fb1c46ec0d09bcbed114ed159c..ba95fd2f6d5e6fad627e72990a32372404ad6fb1 100644 (file)
--- 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 8259ddbb5e228c742f32ee1972c7cf59c02d507e..010f8686d53ad9b45c02b9400668a21b9af20156 100644 (file)
--- 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: