This commit is contained in:
Dr. Stephen Henson 2011-09-16 23:04:07 +00:00
parent 7d453a3b49
commit c0d2943952
3 changed files with 4 additions and 1 deletions

View File

@ -106,6 +106,7 @@ typedef struct
/* /*
* AES-NI section * AES-NI section
*/ */
extern unsigned int OPENSSL_ia32cap_P[2]; extern unsigned int OPENSSL_ia32cap_P[2];
#define AESNI_CAPABLE (1<<(57-32)) #define AESNI_CAPABLE (1<<(57-32))
@ -473,7 +474,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) && if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
(len > (1L<<20)*16)) (len > (1L<<20)*16))
{ {
EVPerr(EVPNI_F_AES_XTS, EVP_R_TOO_LARGE); EVPerr(EVP_F_AESNI_XTS_CIPHER, EVP_R_TOO_LARGE);
return -1; return -1;
} }
#endif #endif

View File

@ -1253,6 +1253,7 @@ void ERR_load_EVP_strings(void);
/* Function codes. */ /* Function codes. */
#define EVP_F_AESNI_INIT_KEY 165 #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_INIT_KEY 133
#define EVP_F_AES_XTS 172 #define EVP_F_AES_XTS 172
#define EVP_F_AES_XTS_CIPHER 175 #define EVP_F_AES_XTS_CIPHER 175

View File

@ -71,6 +71,7 @@
static ERR_STRING_DATA EVP_str_functs[]= static ERR_STRING_DATA EVP_str_functs[]=
{ {
{ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_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_INIT_KEY), "AES_INIT_KEY"},
{ERR_FUNC(EVP_F_AES_XTS), "AES_XTS"}, {ERR_FUNC(EVP_F_AES_XTS), "AES_XTS"},
{ERR_FUNC(EVP_F_AES_XTS_CIPHER), "AES_XTS_CIPHER"}, {ERR_FUNC(EVP_F_AES_XTS_CIPHER), "AES_XTS_CIPHER"},