summaryrefslogtreecommitdiffstats
path: root/crypto/aes
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2022-01-27 15:05:48 +1100
committerPauli <pauli@openssl.org>2022-01-31 11:46:20 +1100
commit1f7c5c56c7365fefd9cff9bea4d3d27346ca44d1 (patch)
tree94bb52e8a12b52bca229f0b5a240f496849f0ac4 /crypto/aes
parentcb7e50ba3f250a9c9978a964e98a8c8940833595 (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/aes')
-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