Fix error codes.

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 9a17ba8042b68d0b0d05e45e28abcae8f2b86b48..d84bc80ef9a478d2a7697e91e1050485b0341d2c 100644 (file)
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -176,7 +176,7 @@ static int aesni_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_AESNI_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);

                return 0;
                }
 
                return 0;
                }
 


@@ -473,7 +473,7 @@ static int aesni_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
                        (len > (1L<<20)*16))
                {
        if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
                        (len > (1L<<20)*16))
                {

-               EVPerr(EVP_F_AES_XTS, EVP_R_TOO_LARGE);
+               EVPerr(EVPNI_F_AES_XTS, EVP_R_TOO_LARGE);

                return -1;
                }
 #endif
                return -1;
                }
 #endif


@@ -1142,7 +1142,7 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
                        (len > (1L<<20)*16))
                {
        if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
                        (len > (1L<<20)*16))
                {

-               EVPerr(EVP_F_AES_XTS, EVP_R_TOO_LARGE);
+               EVPerr(EVP_F_AES_XTS_CIPHER, EVP_R_TOO_LARGE);

                return -1;
                }
 #endif
                return -1;
                }
 #endif