summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2022-01-27 15:05:48 +1100
committerPauli <pauli@openssl.org>2022-01-31 11:39:00 +1100
commite180bf641ed23010073b0882d63d5dfd48409602 (patch)
treedbcecec7c6a9addc9b2b216ff918f1b3f5c91ce5 /crypto
parent7fde39de848f062d6db45bf9e69439db2100b9bb (diff)
aes: make the no-asm constant time code path not the default
After OMC and OTC discussions, the 95% performance loss resulting from the constant time code was deemed excessive for something outside of our security policy. The option to use the constant time code exists as it was in OpenSSL 1.1.1. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17600)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/aes/aes_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 7b9989fd47..d3eaab349f 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -50,7 +50,7 @@
#include <openssl/aes.h>
#include "aes_local.h"
-#if !defined(OPENSSL_NO_AES_CONST_TIME) && !defined(AES_ASM)
+#if defined(OPENSSL_AES_CONST_TIME) && !defined(AES_ASM)
# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
# define U64(C) C##UI64