From a64e99ae2562f8294e0910ce2b72aa17249bd1aa Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Mon, 16 Jun 2025 11:51:10 -0600
Subject: Sprinkle some #ifdef

---
 patches/aes_amd64.c.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 patches/aes_i386.c.patch  | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 patches/aes_amd64.c.patch
 create mode 100644 patches/aes_i386.c.patch

diff --git a/patches/aes_amd64.c.patch b/patches/aes_amd64.c.patch
new file mode 100644
index 0000000..205b71c
--- /dev/null
+++ b/patches/aes_amd64.c.patch
@@ -0,0 +1,55 @@
+--- crypto/aes/aes_amd64.c.orig	Mon Jun 16 11:48:01 2025
++++ crypto/aes/aes_amd64.c	Mon Jun 16 11:51:51 2025
+@@ -45,6 +45,7 @@ void aesni_decrypt(const unsigned char *in, unsigned c
+ void aesni_cbc_encrypt(const unsigned char *in, unsigned char *out,
+     size_t len, const AES_KEY *key, unsigned char *ivec, const int enc);
+ 
++#ifdef HAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+ int
+ aes_set_encrypt_key_internal(const unsigned char *userKey, const int bits,
+     AES_KEY *key)
+@@ -54,7 +55,9 @@ aes_set_encrypt_key_internal(const unsigned char *user
+ 
+ 	return aes_set_encrypt_key_generic(userKey, bits, key);
+ }
++#endif
+ 
++#ifdef HAVE_AES_SET_DECRYPT_KEY_INTERNAL
+ int
+ aes_set_decrypt_key_internal(const unsigned char *userKey, const int bits,
+     AES_KEY *key)
+@@ -64,7 +67,9 @@ aes_set_decrypt_key_internal(const unsigned char *user
+ 
+ 	return aes_set_decrypt_key_generic(userKey, bits, key);
+ }
++#endif
+ 
++#ifdef HAVE_AES_ENCRYPT_INTERNAL
+ void
+ aes_encrypt_internal(const unsigned char *in, unsigned char *out,
+     const AES_KEY *key)
+@@ -76,7 +81,9 @@ aes_encrypt_internal(const unsigned char *in, unsigned
+ 
+ 	aes_encrypt_generic(in, out, key);
+ }
++#endif
+ 
++#ifdef HAVE_AES_DECRYPT_INTERNAL
+ void
+ aes_decrypt_internal(const unsigned char *in, unsigned char *out,
+     const AES_KEY *key)
+@@ -88,7 +95,9 @@ aes_decrypt_internal(const unsigned char *in, unsigned
+ 
+ 	aes_decrypt_generic(in, out, key);
+ }
++#endif
+ 
++#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)
+@@ -100,3 +109,4 @@ aes_cbc_encrypt_internal(const unsigned char *in, unsi
+ 
+ 	aes_cbc_encrypt_generic(in, out, len, key, ivec, enc);
+ }
++#endif
diff --git a/patches/aes_i386.c.patch b/patches/aes_i386.c.patch
new file mode 100644
index 0000000..a195313
--- /dev/null
+++ b/patches/aes_i386.c.patch
@@ -0,0 +1,55 @@
+--- crypto/aes/aes_i386.c.orig	Mon Jun 16 11:54:30 2025
++++ crypto/aes/aes_i386.c	Mon Jun 16 11:53:31 2025
+@@ -45,6 +45,7 @@ void aesni_decrypt(const unsigned char *in, unsigned c
+ void aesni_cbc_encrypt(const unsigned char *in, unsigned char *out,
+     size_t len, const AES_KEY *key, unsigned char *ivec, const int enc);
+ 
++#ifdef HAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+ int
+ aes_set_encrypt_key_internal(const unsigned char *userKey, const int bits,
+     AES_KEY *key)
+@@ -54,7 +55,9 @@ aes_set_encrypt_key_internal(const unsigned char *user
+ 
+ 	return aes_set_encrypt_key_generic(userKey, bits, key);
+ }
++#endif
+ 
++#ifdef HAVE_SET_DECRYPT_KEY_INTERNAL
+ int
+ aes_set_decrypt_key_internal(const unsigned char *userKey, const int bits,
+     AES_KEY *key)
+@@ -64,7 +67,9 @@ aes_set_decrypt_key_internal(const unsigned char *user
+ 
+ 	return aes_set_decrypt_key_generic(userKey, bits, key);
+ }
++#endif
+ 
++#ifdef HAVE_AES_ENCRYPT_INTERNAL
+ void
+ aes_encrypt_internal(const unsigned char *in, unsigned char *out,
+     const AES_KEY *key)
+@@ -76,7 +81,9 @@ aes_encrypt_internal(const unsigned char *in, unsigned
+ 
+ 	aes_encrypt_generic(in, out, key);
+ }
++#endif
+ 
++#ifdef HAVE_AES_DECRYPT_INTERNAL
+ void
+ aes_decrypt_internal(const unsigned char *in, unsigned char *out,
+     const AES_KEY *key)
+@@ -88,7 +95,9 @@ aes_decrypt_internal(const unsigned char *in, unsigned
+ 
+ 	aes_decrypt_generic(in, out, key);
+ }
++#endif
+ 
++#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)
+@@ -100,3 +109,4 @@ aes_cbc_encrypt_internal(const unsigned char *in, unsi
+ 
+ 	aes_cbc_encrypt_generic(in, out, len, key, ivec, enc);
+ }
++#endif
-- 
cgit v1.2.3-55-g6feb