projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6116a9
)
Fix TLS not using aes_cbc_hmac_sha ciphers
author
Bernd Edlinger
<bernd.edlinger@hotmail.de>
Sun, 19 Jan 2020 11:23:40 +0000
(12:23 +0100)
committer
Bernd Edlinger
<bernd.edlinger@hotmail.de>
Tue, 21 Jan 2020 12:55:50 +0000
(13:55 +0100)
AES_ASM was repaced by AESNI_ASM, so use that.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10892)
ssl/record/rec_layer_s3.c
patch
|
blob
|
history
diff --git
a/ssl/record/rec_layer_s3.c
b/ssl/record/rec_layer_s3.c
index 76a00fc510e1ee8091ec5da597395a78791bdabc..9e23b4fb3b5b9e3b7eddf91597a60ee2e2e3e8f4 100644
(file)
--- a/
ssl/record/rec_layer_s3.c
+++ b/
ssl/record/rec_layer_s3.c
@@
-18,7
+18,7
@@
#include "../packet_local.h"
#if defined(OPENSSL_SMALL_FOOTPRINT) || \
- !( defined(AES
_ASM) &&
( \
+ !( defined(AES
NI_ASM) &&
( \
defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) ) \
)