diff options
| author | jsing <> | 2025-06-09 14:28:34 +0000 |
|---|---|---|
| committer | jsing <> | 2025-06-09 14:28:34 +0000 |
| commit | 951cd4503ff3c4cc93c1a36cf06138b1ddd739d7 (patch) | |
| tree | 6c411eca3de0b4b777e48c9aba4d6dd13c8e899a /src/lib/libcrypto/evp/e_aes.c | |
| parent | d8ae322f91ae730f31b750787e0180588dab36dc (diff) | |
| download | openbsd-951cd4503ff3c4cc93c1a36cf06138b1ddd739d7.tar.gz openbsd-951cd4503ff3c4cc93c1a36cf06138b1ddd739d7.tar.bz2 openbsd-951cd4503ff3c4cc93c1a36cf06138b1ddd739d7.zip | |
Make OPENSSL_IA32_SSE2 the default for i386 and remove the flag.
The OPENSSL_IA32_SSE2 flag controls whether a number of the perlasm
scripts generate additional implementations that use SSE2 functionality.
In all cases except ghash, the code checks OPENSSL_ia32cap_P for SSE2
support, before trying to run SSE2 code. For ghash it generates a CLMUL
based implementation in addition to different MMX version (one MMX
version hides behind OPENSSL_IA32_SSE2, the other does not), however this
does not appear to actually use SSE2. We also disable AES-NI on i386 if
OPENSSL_IA32_SSE2.
On OpenBSD, we've always defined OPENSSL_IA32_SSE2 so this is effectively
a no-op. The only change is that we now check MMX rather than SSE2 for the
ghash MMX implementation.
ok bcook@ beck@
Diffstat (limited to 'src/lib/libcrypto/evp/e_aes.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_aes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c index 74d86c98d8..42c0fb45ed 100644 --- a/src/lib/libcrypto/evp/e_aes.c +++ b/src/lib/libcrypto/evp/e_aes.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: e_aes.c,v 1.70 2025/06/06 07:41:01 tb Exp $ */ | 1 | /* $OpenBSD: e_aes.c,v 1.71 2025/06/09 14:28:34 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -115,7 +115,7 @@ void AES_xts_decrypt(const char *inp, char *out, size_t len, | |||
| 115 | 115 | ||
| 116 | #if defined(AES_ASM) && ( \ | 116 | #if defined(AES_ASM) && ( \ |
| 117 | ((defined(__i386) || defined(__i386__) || \ | 117 | ((defined(__i386) || defined(__i386__) || \ |
| 118 | defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \ | 118 | defined(_M_IX86)))|| \ |
| 119 | defined(__x86_64) || defined(__x86_64__) || \ | 119 | defined(__x86_64) || defined(__x86_64__) || \ |
| 120 | defined(_M_AMD64) || defined(_M_X64) || \ | 120 | defined(_M_AMD64) || defined(_M_X64) || \ |
| 121 | defined(__INTEL__) ) | 121 | defined(__INTEL__) ) |
