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/aes/aes.c | |
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/aes/aes.c')
-rw-r--r-- | src/lib/libcrypto/aes/aes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/aes/aes.c b/src/lib/libcrypto/aes/aes.c index 33e6273268..693badcd66 100644 --- a/src/lib/libcrypto/aes/aes.c +++ b/src/lib/libcrypto/aes/aes.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes.c,v 1.13 2025/07/21 10:24:23 jsing Exp $ */ | 1 | /* $OpenBSD: aes.c,v 1.14 2025/07/22 09:13:49 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2002-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2002-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -310,6 +310,7 @@ AES_ecb_encrypt(const unsigned char *in, unsigned char *out, | |||
310 | } | 310 | } |
311 | LCRYPTO_ALIAS(AES_ecb_encrypt); | 311 | LCRYPTO_ALIAS(AES_ecb_encrypt); |
312 | 312 | ||
313 | #ifndef HAVE_AES_ECB_ENCRYPT_INTERNAL | ||
313 | void | 314 | void |
314 | aes_ecb_encrypt_internal(const unsigned char *in, unsigned char *out, | 315 | aes_ecb_encrypt_internal(const unsigned char *in, unsigned char *out, |
315 | size_t len, const AES_KEY *key, int encrypt) | 316 | size_t len, const AES_KEY *key, int encrypt) |
@@ -321,6 +322,7 @@ aes_ecb_encrypt_internal(const unsigned char *in, unsigned char *out, | |||
321 | len -= AES_BLOCK_SIZE; | 322 | len -= AES_BLOCK_SIZE; |
322 | } | 323 | } |
323 | } | 324 | } |
325 | #endif | ||
324 | 326 | ||
325 | #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long)) | 327 | #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long)) |
326 | typedef struct { | 328 | typedef struct { |