wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
ARIA no longer needs OpenSSL enabled
This commit is contained in:
JacobBarthelmeh
2023-08-25 11:48:11 -06:00
committed by GitHub
parent b20c6c54d1 8803510375
commit 2a5ed11f34
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -2668,9 +2668,8 @@ if test "$ENABLED_ARIA" = "yes"
then then
ARIA_DIR=MagicCrypto ARIA_DIR=MagicCrypto
# Enable dependency # Enable dependency
ENABLED_OPENSSLEXTRA="yes"
CFLAGS="$CFLAGS -I$ARIA_DIR/include" 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" AM_LDFLAGS="$AM_LDFLAGS -L$ARIA_DIR/lib -lMagicCrypto"
build_pwd="$(pwd)" build_pwd="$(pwd)"
headers="mcapi_error.h mcapi_type.h mcapi.h" headers="mcapi_error.h mcapi_type.h mcapi.h"

4
wolfcrypt/src/port/aria/aria-crypt.c
View File

@ -36,8 +36,10 @@ size and a key size of 128, 192, or 256 bits.
#ifdef HAVE_ARIA #ifdef HAVE_ARIA
#include <wolfssl/wolfcrypt/error-crypt.h> #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/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 */ /* return 0 on success or WC_INIT_E on failure */
int wc_AriaInitCrypt(wc_Aria* aria, MC_ALGID algo) int wc_AriaInitCrypt(wc_Aria* aria, MC_ALGID algo)

3
wolfcrypt/src/port/aria/aria-cryptocb.c
View File

@ -35,8 +35,9 @@ size and a key size of 128, 192, or 256 bits.
#ifdef HAVE_ARIA #ifdef HAVE_ARIA
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/ssl.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/asn_public.h>
#include <wolfssl/wolfcrypt/port/aria/aria-cryptocb.h> #include <wolfssl/wolfcrypt/port/aria/aria-cryptocb.h>