From: Dr. Stephen Henson Date: Thu, 18 Oct 2012 16:21:39 +0000 (+0000) Subject: fix error code X-Git-Tag: master-post-reformat~1660 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=057c8a2b9e24b91d4e98b38bf1c91f232f065637;p=oweals%2Fopenssl.git fix error code --- diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 783ef2f7d5..c37010ae6d 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -582,7 +582,7 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, if(ret < 0) { - EVPerr(EVP_F_AES_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED); + EVPerr(EVP_F_AES_T4_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED); return 0; } diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index c30d06a048..283dcab09b 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -1285,6 +1285,7 @@ void ERR_load_EVP_strings(void); #define EVP_F_AESNI_INIT_KEY 165 #define EVP_F_AESNI_XTS_CIPHER 176 #define EVP_F_AES_INIT_KEY 133 +#define EVP_F_AES_T4_INIT_KEY 178 #define EVP_F_AES_XTS 172 #define EVP_F_AES_XTS_CIPHER 175 #define EVP_F_ALG_MODULE_INIT 177 diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index ab099f9ed4..5742a949fd 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -73,6 +73,7 @@ static ERR_STRING_DATA EVP_str_functs[]= {ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"}, {ERR_FUNC(EVP_F_AESNI_XTS_CIPHER), "AESNI_XTS_CIPHER"}, {ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"}, +{ERR_FUNC(EVP_F_AES_T4_INIT_KEY), "AES_T4_INIT_KEY"}, {ERR_FUNC(EVP_F_AES_XTS), "AES_XTS"}, {ERR_FUNC(EVP_F_AES_XTS_CIPHER), "AES_XTS_CIPHER"}, {ERR_FUNC(EVP_F_ALG_MODULE_INIT), "ALG_MODULE_INIT"},