diff options
| author | jsing <> | 2025-07-22 09:13:49 +0000 |
|---|---|---|
| committer | jsing <> | 2025-07-22 09:13:49 +0000 |
| commit | da7a63b669ad2a502ae120afede3fd850082e8b6 (patch) | |
| tree | c109a52c16069d775f54e57aabf8ee4bdc49d5f5 /src/lib/libcrypto/arch | |
| parent | b73facdeca098be7e538e556c1a293942db3110c (diff) | |
| download | openbsd-da7a63b669ad2a502ae120afede3fd850082e8b6.tar.gz openbsd-da7a63b669ad2a502ae120afede3fd850082e8b6.tar.bz2 openbsd-da7a63b669ad2a502ae120afede3fd850082e8b6.zip | |
Move AES-NI for ECB out of EVP.
Make aes_ecb_encrypt_internal() replaceable and provide machine dependent
versions for amd64 and i386, which dispatch to AES-NI if appropriate.
Remove the AES-NI specific EVP methods for ECB.
This removes the last of the machine dependent code from EVP AES.
ok bcook@ joshua@ tb@
Diffstat (limited to 'src/lib/libcrypto/arch')
| -rw-r--r-- | src/lib/libcrypto/arch/amd64/crypto_arch.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/i386/crypto_arch.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/arch/amd64/crypto_arch.h b/src/lib/libcrypto/arch/amd64/crypto_arch.h index a51021a307..e8faf0bca1 100644 --- a/src/lib/libcrypto/arch/amd64/crypto_arch.h +++ b/src/lib/libcrypto/arch/amd64/crypto_arch.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto_arch.h,v 1.11 2025/07/21 10:24:23 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.12 2025/07/22 09:13:49 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -40,6 +40,7 @@ extern uint64_t crypto_cpu_caps_amd64; | |||
| 40 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL | 40 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL |
| 41 | #define HAVE_AES_CCM64_ENCRYPT_INTERNAL | 41 | #define HAVE_AES_CCM64_ENCRYPT_INTERNAL |
| 42 | #define HAVE_AES_CTR32_ENCRYPT_INTERNAL | 42 | #define HAVE_AES_CTR32_ENCRYPT_INTERNAL |
| 43 | #define HAVE_AES_ECB_ENCRYPT_INTERNAL | ||
| 43 | #define HAVE_AES_XTS_ENCRYPT_INTERNAL | 44 | #define HAVE_AES_XTS_ENCRYPT_INTERNAL |
| 44 | 45 | ||
| 45 | #define HAVE_GCM128_INIT | 46 | #define HAVE_GCM128_INIT |
diff --git a/src/lib/libcrypto/arch/i386/crypto_arch.h b/src/lib/libcrypto/arch/i386/crypto_arch.h index 34d041b382..ccaa3e8494 100644 --- a/src/lib/libcrypto/arch/i386/crypto_arch.h +++ b/src/lib/libcrypto/arch/i386/crypto_arch.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto_arch.h,v 1.10 2025/07/21 10:24:23 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.11 2025/07/22 09:13:49 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -40,6 +40,7 @@ extern uint64_t crypto_cpu_caps_i386; | |||
| 40 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL | 40 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL |
| 41 | #define HAVE_AES_CCM64_ENCRYPT_INTERNAL | 41 | #define HAVE_AES_CCM64_ENCRYPT_INTERNAL |
| 42 | #define HAVE_AES_CTR32_ENCRYPT_INTERNAL | 42 | #define HAVE_AES_CTR32_ENCRYPT_INTERNAL |
| 43 | #define HAVE_AES_ECB_ENCRYPT_INTERNAL | ||
| 43 | #define HAVE_AES_XTS_ENCRYPT_INTERNAL | 44 | #define HAVE_AES_XTS_ENCRYPT_INTERNAL |
| 44 | 45 | ||
| 45 | #define HAVE_GCM128_INIT | 46 | #define HAVE_GCM128_INIT |
