From 84d57f4f5b4c9b0bc1cff54f7194b002bd0af5e8 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 16 Jun 2025 14:42:18 +0000
Subject: Remove AES-NI specific EVP_CIPHER methods for OFB.

These now end up in aesni_encrypt() via AES_encrypt(), when appropriate.

ok tb@
---
 src/lib/libcrypto/evp/e_aes.c | 65 +------------------------------------------
 1 file changed, 1 insertion(+), 64 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index fcd1dde412..9b09cf3639 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.73 2025/06/16 14:31:52 jsing Exp $ */
+/* $OpenBSD: e_aes.c,v 1.74 2025/06/16 14:42:18 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -237,18 +237,6 @@ aesni_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 	return 1;
 }
 
-static int
-aesni_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, size_t len)
-{
-	EVP_AES_KEY *eak = ctx->cipher_data;
-
-	CRYPTO_ofb128_encrypt(in, out, len, &eak->ks, ctx->iv, &ctx->num,
-	    (block128_f)aesni_encrypt);
-
-	return 1;
-}
-
 static int
 aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     const unsigned char *iv, int enc)
@@ -553,19 +541,6 @@ EVP_aes_128_ecb(void)
 }
 LCRYPTO_ALIAS(EVP_aes_128_ecb);
 
-#ifdef AESNI_CAPABLE
-static const EVP_CIPHER aesni_128_ofb = {
-	.nid = NID_aes_128_ofb128,
-	.block_size = 1,
-	.key_len = 16,
-	.iv_len = 16,
-	.flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
-	.init = aes_init_key,
-	.do_cipher = aesni_ofb_cipher,
-	.ctx_size = sizeof(EVP_AES_KEY),
-};
-#endif
-
 static const EVP_CIPHER aes_128_ofb = {
 	.nid = NID_aes_128_ofb128,
 	.block_size = 1,
@@ -580,11 +555,7 @@ static const EVP_CIPHER aes_128_ofb = {
 const EVP_CIPHER *
 EVP_aes_128_ofb(void)
 {
-#ifdef AESNI_CAPABLE
-	return AESNI_CAPABLE ? &aesni_128_ofb : &aes_128_ofb;
-#else
 	return &aes_128_ofb;
-#endif
 }
 LCRYPTO_ALIAS(EVP_aes_128_ofb);
 
@@ -781,19 +752,6 @@ EVP_aes_192_ecb(void)
 }
 LCRYPTO_ALIAS(EVP_aes_192_ecb);
 
-#ifdef AESNI_CAPABLE
-static const EVP_CIPHER aesni_192_ofb = {
-	.nid = NID_aes_192_ofb128,
-	.block_size = 1,
-	.key_len = 24,
-	.iv_len = 16,
-	.flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
-	.init = aes_init_key,
-	.do_cipher = aesni_ofb_cipher,
-	.ctx_size = sizeof(EVP_AES_KEY),
-};
-#endif
-
 static const EVP_CIPHER aes_192_ofb = {
 	.nid = NID_aes_192_ofb128,
 	.block_size = 1,
@@ -808,11 +766,7 @@ static const EVP_CIPHER aes_192_ofb = {
 const EVP_CIPHER *
 EVP_aes_192_ofb(void)
 {
-#ifdef AESNI_CAPABLE
-	return AESNI_CAPABLE ? &aesni_192_ofb : &aes_192_ofb;
-#else
 	return &aes_192_ofb;
-#endif
 }
 LCRYPTO_ALIAS(EVP_aes_192_ofb);
 
@@ -1009,19 +963,6 @@ EVP_aes_256_ecb(void)
 }
 LCRYPTO_ALIAS(EVP_aes_256_ecb);
 
-#ifdef AESNI_CAPABLE
-static const EVP_CIPHER aesni_256_ofb = {
-	.nid = NID_aes_256_ofb128,
-	.block_size = 1,
-	.key_len = 32,
-	.iv_len = 16,
-	.flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE,
-	.init = aes_init_key,
-	.do_cipher = aesni_ofb_cipher,
-	.ctx_size = sizeof(EVP_AES_KEY),
-};
-#endif
-
 static const EVP_CIPHER aes_256_ofb = {
 	.nid = NID_aes_256_ofb128,
 	.block_size = 1,
@@ -1036,11 +977,7 @@ static const EVP_CIPHER aes_256_ofb = {
 const EVP_CIPHER *
 EVP_aes_256_ofb(void)
 {
-#ifdef AESNI_CAPABLE
-	return AESNI_CAPABLE ? &aesni_256_ofb : &aes_256_ofb;
-#else
 	return &aes_256_ofb;
-#endif
 }
 LCRYPTO_ALIAS(EVP_aes_256_ofb);
 
-- 
cgit v1.2.3-55-g6feb