summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/e_aes.c
diff options
context:
space:
mode:
authorjsing <>2025-05-18 11:07:45 +0000
committerjsing <>2025-05-18 11:07:45 +0000
commit031ab0dab50392e35c95211aa8421faf15a0e535 (patch)
treeff8dce86a20f67d800475bd47b61a4586902a7d5 /src/lib/libcrypto/evp/e_aes.c
parent326a95a8c809a01004d17e615e71f4b2bf311169 (diff)
downloadopenbsd-031ab0dab50392e35c95211aa8421faf15a0e535.tar.gz
openbsd-031ab0dab50392e35c95211aa8421faf15a0e535.tar.bz2
openbsd-031ab0dab50392e35c95211aa8421faf15a0e535.zip
Unifdef AES_CTR_ASM.
This is a remnant from s390x assembly.
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/evp/e_aes.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 59ed9e93e2..72d1991ce2 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.63 2025/05/18 09:47:38 jsing Exp $ */ 1/* $OpenBSD: e_aes.c,v 1.64 2025/05/18 11:07:45 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 *
@@ -107,11 +107,6 @@ typedef struct {
107 107
108#define MAXBITCHUNK ((size_t)1<<(sizeof(size_t)*8-4)) 108#define MAXBITCHUNK ((size_t)1<<(sizeof(size_t)*8-4))
109 109
110#ifdef AES_CTR_ASM
111void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out,
112 size_t blocks, const AES_KEY *key,
113 const unsigned char ivec[AES_BLOCK_SIZE]);
114#endif
115#ifdef AES_XTS_ASM 110#ifdef AES_XTS_ASM
116void AES_xts_encrypt(const char *inp, char *out, size_t len, 111void AES_xts_encrypt(const char *inp, char *out, size_t len,
117 const AES_KEY *key1, const AES_KEY *key2, const unsigned char iv[16]); 112 const AES_KEY *key1, const AES_KEY *key2, const unsigned char iv[16]);
@@ -338,10 +333,6 @@ aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
338 } else { 333 } else {
339 ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks); 334 ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks);
340 dat->block = (block128_f)AES_encrypt; 335 dat->block = (block128_f)AES_encrypt;
341#ifdef AES_CTR_ASM
342 if (mode == EVP_CIPH_CTR_MODE)
343 dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
344#endif
345 } 336 }
346 337
347 if (ret < 0) { 338 if (ret < 0) {
@@ -1398,11 +1389,7 @@ aes_gcm_set_key(AES_KEY *aes_key, GCM128_CONTEXT *gcm_ctx,
1398{ 1389{
1399 AES_set_encrypt_key(key, key_len * 8, aes_key); 1390 AES_set_encrypt_key(key, key_len * 8, aes_key);
1400 CRYPTO_gcm128_init(gcm_ctx, aes_key, (block128_f)AES_encrypt); 1391 CRYPTO_gcm128_init(gcm_ctx, aes_key, (block128_f)AES_encrypt);
1401#ifdef AES_CTR_ASM
1402 return (ctr128_f)AES_ctr32_encrypt;
1403#else
1404 return NULL; 1392 return NULL;
1405#endif
1406} 1393}
1407 1394
1408static int 1395static int