From 031ab0dab50392e35c95211aa8421faf15a0e535 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 18 May 2025 11:07:45 +0000
Subject: Unifdef AES_CTR_ASM.

This is a remnant from s390x assembly.
---
 src/lib/libcrypto/evp/e_aes.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/lib')

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 @@
-/* $OpenBSD: e_aes.c,v 1.63 2025/05/18 09:47:38 jsing Exp $ */
+/* $OpenBSD: e_aes.c,v 1.64 2025/05/18 11:07:45 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -107,11 +107,6 @@ typedef struct {
 
 #define MAXBITCHUNK	((size_t)1<<(sizeof(size_t)*8-4))
 
-#ifdef AES_CTR_ASM
-void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out,
-    size_t blocks, const AES_KEY *key,
-    const unsigned char ivec[AES_BLOCK_SIZE]);
-#endif
 #ifdef AES_XTS_ASM
 void AES_xts_encrypt(const char *inp, char *out, size_t len,
     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,
 	} else {
 		ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks);
 		dat->block = (block128_f)AES_encrypt;
-#ifdef AES_CTR_ASM
-		if (mode == EVP_CIPH_CTR_MODE)
-			dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
-#endif
 	}
 
 	if (ret < 0) {
@@ -1398,11 +1389,7 @@ aes_gcm_set_key(AES_KEY *aes_key, GCM128_CONTEXT *gcm_ctx,
 {
 	AES_set_encrypt_key(key, key_len * 8, aes_key);
 	CRYPTO_gcm128_init(gcm_ctx, aes_key, (block128_f)AES_encrypt);
-#ifdef AES_CTR_ASM
-	return (ctr128_f)AES_ctr32_encrypt;
-#else
 	return NULL;
-#endif
 }
 
 static int
-- 
cgit v1.2.3-55-g6feb