diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-01-03 21:29:57 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-01-03 21:40:08 +0100 |
| commit | 2f3af3dc36b6341990e4159b6e630878adad57e4 (patch) | |
| tree | bfaf9bf71ba50ad4d8841e7af11779abee8db8a7 /crypto/evp/e_aes_cbc_hmac_sha256.c | |
| parent | b77b58a398c8b9b4113f3fb6b48e162a3b8d4527 (diff) | |
aesni-sha1-x86_64.pl: add stiched decrypt procedure,
but keep it disabled, too little gain... Add some Atom-specific
optimization.
Diffstat (limited to 'crypto/evp/e_aes_cbc_hmac_sha256.c')
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index e1a21b39ee..8470bb96b8 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -400,7 +400,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, iv = AES_BLOCK_SIZE; #if defined(STITCHED_CALL) - if (OPENSSL_ia32cap_P[1]&(1<<(60-32)) && + if (OPENSSL_ia32cap_P[1]&(1<<(60-32)) && /* AVX? */ plen>(sha_off+iv) && (blocks=(plen-(sha_off+iv))/SHA256_CBLOCK)) { SHA256_Update(&key->md,in+iv,sha_off); @@ -451,7 +451,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, aesni_cbc_encrypt(in,out,len, &key->ks,ctx->iv,0); - if (plen) { /* "TLS" mode of operation */ + if (plen != NO_PAYLOAD_LENGTH) { /* "TLS" mode of operation */ size_t inp_len, mask, j, i; unsigned int res, maxpad, pad, bitlen; int ret = 1; |