fix error code
authorDr. Stephen Henson <steve@openssl.org>
Thu, 18 Oct 2012 16:21:39 +0000 (16:21 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 18 Oct 2012 16:21:39 +0000 (16:21 +0000)
crypto/evp/e_aes.c
crypto/evp/evp.h
crypto/evp/evp_err.c

index 783ef2f7d56ee700d7df8dd044940856562422fd..c37010ae6de19c5969b5dba0b1bb1baffcef4d3a 100644 (file)
@@ -582,7 +582,7 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
        if(ret < 0)
                {
 
        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;
                }
 
                return 0;
                }
 
index c30d06a0481eeb81bdc94d465289916cbed89112..283dcab09b0ee7ad7fabd4bc1ca58a08466adca0 100644 (file)
@@ -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_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
 #define EVP_F_AES_XTS                                   172
 #define EVP_F_AES_XTS_CIPHER                            175
 #define EVP_F_ALG_MODULE_INIT                           177
index ab099f9ed4bfdc820d24de4af99cafc96caec323..5742a949fd80a40a25c1587e1544b8d97228f704 100644 (file)
@@ -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_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"},
 {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"},