Merge pull request #6730 from gojimmypi/aria-no-openssl

ARIA no longer needs OpenSSL enabled

Author: JacobBarthelmeh

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"

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)

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>