1 files changed, 28 insertions, 73 deletions

diff --git a/src/lib/libcrypto/aes/aes_core.c b/src/lib/libcrypto/aes/aes_core.c
index 4383d74903..8eccb998d3 100644
--- a/src/lib/libcrypto/aes/aes_core.c
+++ b/src/lib/libcrypto/aes/aes_core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes_core.c,v 1.25 2024/11/13 21:00:57 tb Exp $ */
+/* $OpenBSD: aes_core.c,v 1.27 2025/04/21 12:23:09 jsing Exp $ */
 /**
  * rijndael-alg-fst.c
  *
@@ -30,7 +30,7 @@
  * compatible API.
  */
 
-#include <stdlib.h>
+#include <stdint.h>
 
 #include <openssl/aes.h>
 
@@ -55,7 +55,7 @@ Td4[x] = Si[x].[01];
     !defined(HAVE_AES_SET_DECRYPT_KEY_INTERNAL) || \
     !defined(HAVE_AES_ENCRYPT_INTERNAL) || \
     !defined(HAVE_AES_DECRYPT_INTERNAL)
-static const u32 Te0[256] = {
+static const uint32_t Te0[256] = {
         0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
         0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
         0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
@@ -121,7 +121,7 @@ static const u32 Te0[256] = {
         0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
         0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
 };
-static const u32 Te1[256] = {
+static const uint32_t Te1[256] = {
         0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
         0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
         0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
@@ -187,7 +187,7 @@ static const u32 Te1[256] = {
         0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
         0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
 };
-static const u32 Te2[256] = {
+static const uint32_t Te2[256] = {
         0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
         0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
         0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
@@ -253,7 +253,7 @@ static const u32 Te2[256] = {
         0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
         0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
 };
-static const u32 Te3[256] = {
+static const uint32_t Te3[256] = {
         0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
         0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
         0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
@@ -320,7 +320,7 @@ static const u32 Te3[256] = {
         0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
 };
 
-static const u32 Td0[256] = {
+static const uint32_t Td0[256] = {
         0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
         0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
         0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
@@ -386,7 +386,7 @@ static const u32 Td0[256] = {
         0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
         0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
 };
-static const u32 Td1[256] = {
+static const uint32_t Td1[256] = {
         0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
         0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
         0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
@@ -452,7 +452,7 @@ static const u32 Td1[256] = {
         0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
         0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
 };
-static const u32 Td2[256] = {
+static const uint32_t Td2[256] = {
         0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
         0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
         0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
@@ -518,7 +518,7 @@ static const u32 Td2[256] = {
         0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
         0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
 };
-static const u32 Td3[256] = {
+static const uint32_t Td3[256] = {
         0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
         0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
         0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
@@ -588,7 +588,7 @@ static const u32 Td3[256] = {
 
 #if !defined(HAVE_AES_ENCRYPT_INTERNAL) || \
     !defined(HAVE_AES_DECRYPT_INTERNAL)
-static const u8 Td4[256] = {
+static const uint8_t Td4[256] = {
         0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
         0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
         0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
@@ -626,29 +626,24 @@ static const u8 Td4[256] = {
 
 #if !defined(HAVE_AES_SET_ENCRYPT_KEY_INTERNAL) || \
     !defined(HAVE_AES_SET_DECRYPT_KEY_INTERNAL)
-static const u32 rcon[] = {
+static const uint32_t rcon[] = {
         0x01000000, 0x02000000, 0x04000000, 0x08000000,
         0x10000000, 0x20000000, 0x40000000, 0x80000000,
         0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 #endif
 
-#ifdef HAVE_AES_SET_ENCRYPT_KEY_INTERNAL
-int aes_set_encrypt_key_internal(const unsigned char *userKey, const int bits,
-    AES_KEY *key);
-
-#else
-
+#ifndef HAVE_AES_SET_ENCRYPT_KEY_INTERNAL
 /*
  * Expand the cipher key into the encryption key schedule.
  */
-static inline int
+int
 aes_set_encrypt_key_internal(const unsigned char *userKey, const int bits,
     AES_KEY *key)
 {
-        u32 *rk;
+        uint32_t *rk;
         int i = 0;
-        u32 temp;
+        uint32_t temp;
 
         if (!userKey || !key)
                 return -1;
@@ -742,28 +737,17 @@ aes_set_encrypt_key_internal(const unsigned char *userKey, const int bits,
 }
 #endif
 
-int
-AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key)
-{
-        return aes_set_encrypt_key_internal(userKey, bits, key);
-}
-LCRYPTO_ALIAS(AES_set_encrypt_key);
-
-#ifdef HAVE_AES_SET_DECRYPT_KEY_INTERNAL
-int aes_set_decrypt_key_internal(const unsigned char *userKey, const int bits,
-    AES_KEY *key);
-
-#else
+#ifndef HAVE_AES_SET_DECRYPT_KEY_INTERNAL
 /*
  * Expand the cipher key into the decryption key schedule.
  */
-static inline int
+int
 aes_set_decrypt_key_internal(const unsigned char *userKey, const int bits,
     AES_KEY *key)
 {
-        u32 *rk;
+        uint32_t *rk;
         int i, j, status;
-        u32 temp;
+        uint32_t temp;
 
         /* first, start with an encryption schedule */
         status = AES_set_encrypt_key(userKey, bits, key);
@@ -815,27 +799,16 @@ aes_set_decrypt_key_internal(const unsigned char *userKey, const int bits,
 }
 #endif
 
-int
-AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key)
-{
-        return aes_set_decrypt_key_internal(userKey, bits, key);
-}
-LCRYPTO_ALIAS(AES_set_decrypt_key);
-
-#ifdef HAVE_AES_ENCRYPT_INTERNAL
-void aes_encrypt_internal(const unsigned char *in, unsigned char *out,
-    const AES_KEY *key);
-
-#else
+#ifndef HAVE_AES_ENCRYPT_INTERNAL
 /*
  * Encrypt a single block - in and out can overlap.
  */
-static inline void
+void
 aes_encrypt_internal(const unsigned char *in, unsigned char *out,
     const AES_KEY *key)
 {
-        const u32 *rk;
-        u32 s0, s1, s2, s3, t0, t1, t2, t3;
+        const uint32_t *rk;
+        uint32_t s0, s1, s2, s3, t0, t1, t2, t3;
 #ifndef FULL_UNROLL
         int r;
 #endif /* ?FULL_UNROLL */
@@ -1018,27 +991,16 @@ aes_encrypt_internal(const unsigned char *in, unsigned char *out,
 }
 #endif
 
-void
-AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
-{
-        aes_encrypt_internal(in, out, key);
-}
-LCRYPTO_ALIAS(AES_encrypt);
-
-#ifdef HAVE_AES_DECRYPT_INTERNAL
-void aes_decrypt_internal(const unsigned char *in, unsigned char *out,
-    const AES_KEY *key);
-
-#else
+#ifndef HAVE_AES_DECRYPT_INTERNAL
 /*
  * Decrypt a single block - in and out can overlap.
  */
-static inline void
+void
 aes_decrypt_internal(const unsigned char *in, unsigned char *out,
     const AES_KEY *key)
 {
-        const u32 *rk;
-        u32 s0, s1, s2, s3, t0, t1, t2, t3;
+        const uint32_t *rk;
+        uint32_t s0, s1, s2, s3, t0, t1, t2, t3;
 #ifndef FULL_UNROLL
         int r;
 #endif /* ?FULL_UNROLL */
@@ -1220,10 +1182,3 @@ aes_decrypt_internal(const unsigned char *in, unsigned char *out,
         crypto_store_htobe32(&out[3 * 4], s3);
 }
 #endif
-
-void
-AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
-{
-        aes_decrypt_internal(in, out, key);
-}
-LCRYPTO_ALIAS(AES_decrypt);