From 79868e04e6efa26035e7e479e6094da677341390 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 19 May 2025 04:01:07 +0000
Subject: Remove block128_f function casts.

Provide aes_{en,de}crypt_block128() which have correct function signatures
and use these when calling the various mode functions.

ok joshua@ tb@
---
 src/lib/libcrypto/aes/aes.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/aes/aes.c b/src/lib/libcrypto/aes/aes.c
index 3dc2c9a458..712168e9fa 100644
--- a/src/lib/libcrypto/aes/aes.c
+++ b/src/lib/libcrypto/aes/aes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes.c,v 1.5 2025/04/20 09:17:53 jsing Exp $ */
+/* $OpenBSD: aes.c,v 1.6 2025/05/19 04:01:07 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -97,6 +97,18 @@ AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
 }
 LCRYPTO_ALIAS(AES_decrypt);
 
+void
+aes_encrypt_block128(const unsigned char *in, unsigned char *out, const void *key)
+{
+	aes_encrypt_internal(in, out, key);
+}
+
+void
+aes_decrypt_block128(const unsigned char *in, unsigned char *out, const void *key)
+{
+	aes_decrypt_internal(in, out, key);
+}
+
 #ifdef HAVE_AES_CBC_ENCRYPT_INTERNAL
 void aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out,
     size_t len, const AES_KEY *key, unsigned char *ivec, const int enc);
@@ -108,10 +120,10 @@ aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out,
 {
 	if (enc)
 		CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
-		    (block128_f)AES_encrypt);
+		    aes_encrypt_block128);
 	else
 		CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
-		    (block128_f)AES_decrypt);
+		    aes_decrypt_block128);
 }
 #endif
 
@@ -134,7 +146,7 @@ AES_cfb128_encrypt(const unsigned char *in, unsigned char *out, size_t length,
     const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
 {
 	CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
-	    (block128_f)AES_encrypt);
+	    aes_encrypt_block128);
 }
 LCRYPTO_ALIAS(AES_cfb128_encrypt);
 
@@ -144,7 +156,7 @@ AES_cfb1_encrypt(const unsigned char *in, unsigned char *out, size_t length,
     const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
 {
 	CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
-	    (block128_f)AES_encrypt);
+	    aes_encrypt_block128);
 }
 LCRYPTO_ALIAS(AES_cfb1_encrypt);
 
@@ -153,7 +165,7 @@ AES_cfb8_encrypt(const unsigned char *in, unsigned char *out, size_t length,
     const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
 {
 	CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
-	    (block128_f)AES_encrypt);
+	    aes_encrypt_block128);
 }
 LCRYPTO_ALIAS(AES_cfb8_encrypt);
 
@@ -163,7 +175,7 @@ AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
     unsigned char ecount_buf[AES_BLOCK_SIZE], unsigned int *num)
 {
 	CRYPTO_ctr128_encrypt(in, out, length, key, ivec, ecount_buf, num,
-	    (block128_f)AES_encrypt);
+	    aes_encrypt_block128);
 }
 LCRYPTO_ALIAS(AES_ctr128_encrypt);
 
@@ -183,7 +195,7 @@ AES_ofb128_encrypt(const unsigned char *in, unsigned char *out, size_t length,
     const AES_KEY *key, unsigned char *ivec, int *num)
 {
 	CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
-	    (block128_f)AES_encrypt);
+	    aes_encrypt_block128);
 }
 LCRYPTO_ALIAS(AES_ofb128_encrypt);
 
-- 
cgit v1.2.3-55-g6feb