From 68a05ec62385b232f708ac78779365e9df2805be Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Tue, 26 Nov 2024 13:27:15 -0500
Subject: [PATCH 1/3] Add AES_BLOCK_SIZE definition

---
 include/wolfengine/we_internal.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/wolfengine/we_internal.h b/include/wolfengine/we_internal.h
index c12b057..24d7201 100644
--- a/include/wolfengine/we_internal.h
+++ b/include/wolfengine/we_internal.h
@@ -52,6 +52,7 @@
 #endif
 
 #include <openssl/engine.h>
+#include <openssl/aes.h>
 #include <openssl/evp.h>
 #include <openssl/ec.h>
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L

From 3fa0f58f1fdc5458db11342a36118d283582644c Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Tue, 26 Nov 2024 15:09:13 -0500
Subject: [PATCH 2/3] Better definition fix

---
 include/wolfengine/we_internal.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/wolfengine/we_internal.h b/include/wolfengine/we_internal.h
index 24d7201..707fd16 100644
--- a/include/wolfengine/we_internal.h
+++ b/include/wolfengine/we_internal.h
@@ -138,6 +138,14 @@ WOLFENGINE_LOCAL void *we_memdup(const void *data, size_t siz);
     #define WE_PRINTF_FUNC(s, v)
 #endif
 
+#ifndef AES_BLOCK_SIZE
+    #ifdef WC_NO_COMPAT_AES_BLOCK_SIZE
+        #define AES_BLOCK_SIZE WC_AES_BLOCK_SIZE
+    #else
+        #error AES_BLOCK_SIZE not defined when it should be
+    #endif
+#endif
+
 /*
  * Global random
  */

From 737765e358d30d5c5c33d21ddb7ab4350b7cce58 Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Mon, 2 Dec 2024 18:24:22 -0500
Subject: [PATCH 3/3] Need to have wolfcrypt/aes.h loaded first

---
 include/wolfengine/we_internal.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/wolfengine/we_internal.h b/include/wolfengine/we_internal.h
index 707fd16..409b24d 100644
--- a/include/wolfengine/we_internal.h
+++ b/include/wolfengine/we_internal.h
@@ -52,7 +52,6 @@
 #endif
 
 #include <openssl/engine.h>
-#include <openssl/aes.h>
 #include <openssl/evp.h>
 #include <openssl/ec.h>
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
@@ -139,10 +138,13 @@ WOLFENGINE_LOCAL void *we_memdup(const void *data, size_t siz);
 #endif
 
 #ifndef AES_BLOCK_SIZE
-    #ifdef WC_NO_COMPAT_AES_BLOCK_SIZE
-        #define AES_BLOCK_SIZE WC_AES_BLOCK_SIZE
-    #else
-        #error AES_BLOCK_SIZE not defined when it should be
+    #include <openssl/aes.h>
+    #ifndef AES_BLOCK_SIZE
+        #ifdef WC_NO_COMPAT_AES_BLOCK_SIZE
+            #define AES_BLOCK_SIZE WC_AES_BLOCK_SIZE
+        #else
+            #error AES_BLOCK_SIZE not defined when it should be
+        #endif
     #endif
 #endif