generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

evp/e_aes_cbc_hmac_sha256.c: enable is on all AES-NI platforms, not only on AVX.

Browse Source
This commit is contained in:
Andy Polyakov 2013-10-03 00:16:51 +02:00
parent 066caf0551
commit 5f487e0317
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/evp/e_aes_cbc_hmac_sha256.c
View File

@ -94,7 +94,7 @@ typedef struct
#endif #endif
extern unsigned int OPENSSL_ia32cap_P[3]; extern unsigned int OPENSSL_ia32cap_P[3];
#define AESNI_AVX_CAPABLE (1<<(57-32)|1<<(60-32)) #define AESNI_CAPABLE (1<<(57-32))
int aesni_set_encrypt_key(const unsigned char *userKey, int bits, int aesni_set_encrypt_key(const unsigned char *userKey, int bits,
AES_KEY *key); AES_KEY *key);
@ -204,7 +204,9 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
iv = AES_BLOCK_SIZE; iv = AES_BLOCK_SIZE;
#if defined(STITCHED_CALL) #if defined(STITCHED_CALL)
if (plen>(sha_off+iv) && (blocks=(plen-(sha_off+iv))/SHA256_CBLOCK)) { if (OPENSSL_ia32cap_P[1]&(1<<(60-32)) &&
plen>(sha_off+iv) &&
(blocks=(plen-(sha_off+iv))/SHA256_CBLOCK)) {
SHA256_Update(&key->md,in+iv,sha_off); SHA256_Update(&key->md,in+iv,sha_off);
(void)aesni_cbc_sha256_enc(in,out,blocks,&key->ks, (void)aesni_cbc_sha256_enc(in,out,blocks,&key->ks,
@ -574,14 +576,14 @@ static EVP_CIPHER aesni_256_cbc_hmac_sha256_cipher =
const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void) const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void)
{ {
return((OPENSSL_ia32cap_P[1]&AESNI_AVX_CAPABLE)==AESNI_AVX_CAPABLE && return((OPENSSL_ia32cap_P[1]&AESNI_CAPABLE) &&
aesni_cbc_sha256_enc(NULL,NULL,0,NULL,NULL,NULL,NULL) ? aesni_cbc_sha256_enc(NULL,NULL,0,NULL,NULL,NULL,NULL) ?
&aesni_128_cbc_hmac_sha256_cipher:NULL); &aesni_128_cbc_hmac_sha256_cipher:NULL);
} }
const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void) const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void)
{ {
return((OPENSSL_ia32cap_P[1]&AESNI_AVX_CAPABLE)==AESNI_AVX_CAPABLE && return((OPENSSL_ia32cap_P[1]&AESNI_CAPABLE) &&
aesni_cbc_sha256_enc(NULL,NULL,0,NULL,NULL,NULL,NULL)? aesni_cbc_sha256_enc(NULL,NULL,0,NULL,NULL,NULL,NULL)?
&aesni_256_cbc_hmac_sha256_cipher:NULL); &aesni_256_cbc_hmac_sha256_cipher:NULL);
} }