From 880351037582408ab567019b465f86334aacb5fc Mon Sep 17 00:00:00 2001
From: gojimmypi <jim@wolfssl.com>
Date: Thu, 24 Aug 2023 15:57:14 -0700
Subject: [PATCH] ARIA no longer needs OpenSSL enabled

---
 configure.ac                            | 3 +--
 wolfcrypt/src/port/aria/aria-crypt.c    | 4 +++-
 wolfcrypt/src/port/aria/aria-cryptocb.c | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 140db1f21..16f0ba138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2668,9 +2668,8 @@ if test "$ENABLED_ARIA" = "yes"
 then
     ARIA_DIR=MagicCrypto
     # Enable dependency
-    ENABLED_OPENSSLEXTRA="yes"
     CFLAGS="$CFLAGS -I$ARIA_DIR/include"
-    AM_CFLAGS="$AM_CFLAGS -DHAVE_ARIA -DOPENSSL_EXTRA"
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_ARIA"
     AM_LDFLAGS="$AM_LDFLAGS -L$ARIA_DIR/lib -lMagicCrypto"
     build_pwd="$(pwd)"
     headers="mcapi_error.h mcapi_type.h mcapi.h"
diff --git a/wolfcrypt/src/port/aria/aria-crypt.c b/wolfcrypt/src/port/aria/aria-crypt.c
index 502f51af4..202ae8b3a 100644
--- a/wolfcrypt/src/port/aria/aria-crypt.c
+++ b/wolfcrypt/src/port/aria/aria-crypt.c
@@ -36,8 +36,10 @@ size and a key size of 128, 192, or 256 bits.
 #ifdef HAVE_ARIA
 
 #include <wolfssl/wolfcrypt/error-crypt.h>
-#include <wolfssl/ssl.h>
+#include <wolfssl/wolfcrypt/aes.h>
 #include <wolfssl/wolfcrypt/port/aria/aria-crypt.h>
+#include <wolfssl/error-ssl.h>
+#include <wolfssl/ssl.h>
 
 /* return 0 on success or WC_INIT_E on failure */
 int wc_AriaInitCrypt(wc_Aria* aria, MC_ALGID algo)
diff --git a/wolfcrypt/src/port/aria/aria-cryptocb.c b/wolfcrypt/src/port/aria/aria-cryptocb.c
index b1cf45c41..e52509a55 100644
--- a/wolfcrypt/src/port/aria/aria-cryptocb.c
+++ b/wolfcrypt/src/port/aria/aria-cryptocb.c
@@ -35,8 +35,9 @@ size and a key size of 128, 192, or 256 bits.
 
 #ifdef HAVE_ARIA
 
-#include <wolfssl/wolfcrypt/error-crypt.h>
 #include <wolfssl/ssl.h>
+#include <wolfssl/wolfcrypt/error-crypt.h>
+#include <wolfssl/wolfcrypt/ecc.h>
 #include <wolfssl/wolfcrypt/asn_public.h>
 #include <wolfssl/wolfcrypt/port/aria/aria-cryptocb.h>