feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix define name

Browse Source 
WOLFSSL_ARMASM_NO_CRYPTO -> WOLFSSL_ARMASM_NO_HW_CRYPTO
This commit is contained in:
Sean Parkinson
2022-09-08 08:39:00 +10:00
parent 7d67ffac69
commit 5dc1732036
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2081,7 +2081,7 @@ then
AC_MSG_NOTICE([64bit ARMv8 found, setting mcpu to generic+crypto]) AC_MSG_NOTICE([64bit ARMv8 found, setting mcpu to generic+crypto])
;; ;;
armv7a) armv7a)
AM_CPPFLAGS="$AM_CPPFLAGS -march=armv7-a -mfpu=neon -DWOLFSSL_ARMASM_NO_CRYPTO -DWOLFSSL_ARM_ARCH=7" AM_CPPFLAGS="$AM_CPPFLAGS -march=armv7-a -mfpu=neon -DWOLFSSL_ARMASM_NO_HW_CRYPTO -DWOLFSSL_ARM_ARCH=7"
# Include options.h # Include options.h
AM_CCASFLAGS="$AM_CCASFLAGS -DEXTERNAL_OPTS_OPENVPN" AM_CCASFLAGS="$AM_CCASFLAGS -DEXTERNAL_OPTS_OPENVPN"
ENABLED_ARMASM_CRYPTO=no ENABLED_ARMASM_CRYPTO=no

6
wolfcrypt/src/aes.c
View File

@ -306,7 +306,7 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits
#include <wolfcrypt/src/misc.c> #include <wolfcrypt/src/misc.c>
#endif #endif
#if !defined(WOLFSSL_ARMASM) || defined(WOLFSSL_ARMASM_NO_CRYPTO) #if !defined(WOLFSSL_ARMASM) || defined(WOLFSSL_ARMASM_NO_HW_CRYPTO)
#ifdef WOLFSSL_IMX6_CAAM_BLOB #ifdef WOLFSSL_IMX6_CAAM_BLOB
/* case of possibly not using hardware acceleration for AES but using key /* case of possibly not using hardware acceleration for AES but using key
@ -4601,7 +4601,7 @@ static WC_INLINE void IncCtr(byte* ctr, word32 ctrSz)
#endif #endif
#if defined(WOLFSSL_ARMASM) && !defined(WOLFSSL_ARMASM_NO_CRYPTO) #if defined(WOLFSSL_ARMASM) && !defined(WOLFSSL_ARMASM_NO_HW_CRYPTO)
/* implementation is located in wolfcrypt/src/port/arm/armv8-aes.c */ /* implementation is located in wolfcrypt/src/port/arm/armv8-aes.c */
#elif defined(WOLFSSL_AFALG) #elif defined(WOLFSSL_AFALG)
@ -9933,7 +9933,7 @@ int wc_AesCcmCheckTagSize(int sz)
return 0; return 0;
} }
#if defined(WOLFSSL_ARMASM) && !defined(WOLFSSL_ARMASM_NO_CRYPTO) #if defined(WOLFSSL_ARMASM) && !defined(WOLFSSL_ARMASM_NO_HW_CRYPTO)
/* implementation located in wolfcrypt/src/port/arm/armv8-aes.c */ /* implementation located in wolfcrypt/src/port/arm/armv8-aes.c */
#elif defined(HAVE_COLDFIRE_SEC) #elif defined(HAVE_COLDFIRE_SEC)

2
wolfcrypt/src/port/arm/armv8-aes.c
View File

@ -33,7 +33,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if !defined(NO_AES) && defined(WOLFSSL_ARMASM) && \ #if !defined(NO_AES) && defined(WOLFSSL_ARMASM) && \
!defined(WOLFSSL_ARMASM_NO_CRYPTO) !defined(WOLFSSL_ARMASM_NO_HW_CRYPTO)
#ifdef HAVE_FIPS #ifdef HAVE_FIPS
#undef HAVE_FIPS #undef HAVE_FIPS

8
wolfcrypt/src/port/arm/armv8-sha256.c
View File

@ -45,7 +45,7 @@
#endif #endif
#ifndef WOLFSSL_ARMASM_NO_CRYPTO #ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
static const ALIGN32 word32 K[64] = { static const ALIGN32 word32 K[64] = {
0x428A2F98L, 0x71374491L, 0xB5C0FBCFL, 0xE9B5DBA5L, 0x3956C25BL, 0x428A2F98L, 0x71374491L, 0xB5C0FBCFL, 0xE9B5DBA5L, 0x3956C25BL,
0x59F111F1L, 0x923F82A4L, 0xAB1C5ED5L, 0xD807AA98L, 0x12835B01L, 0x59F111F1L, 0x923F82A4L, 0xAB1C5ED5L, 0xD807AA98L, 0x12835B01L,
@ -96,7 +96,7 @@ static WC_INLINE void AddLength(wc_Sha256* sha256, word32 len)
} }
#ifndef WOLFSSL_ARMASM_NO_CRYPTO #ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
#ifdef __aarch64__ #ifdef __aarch64__
@ -1411,7 +1411,7 @@ static WC_INLINE int Sha256Final(wc_Sha256* sha256, byte* hash)
return 0; return 0;
} }
#endif /* !WOLFSSL_ARMASM_NO_CRYPTO */ #endif /* !WOLFSSL_ARMASM_NO_HW_CRYPTO */
#ifndef NO_SHA256 #ifndef NO_SHA256
@ -1537,7 +1537,7 @@ int wc_Sha256Transform(wc_Sha256* sha256, const unsigned char* data)
#else #else
XMEMCPY(sha256->buffer, data, WC_SHA256_BLOCK_SIZE); XMEMCPY(sha256->buffer, data, WC_SHA256_BLOCK_SIZE);
#endif #endif
#ifndef WOLFSSL_ARMASM_NO_CRYPTO #ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
Sha256Transform(sha256, data, 1); Sha256Transform(sha256, data, 1);
#else #else
Transform_Sha256_Len(sha256, data, WC_SHA256_BLOCK_SIZE); Transform_Sha256_Len(sha256, data, WC_SHA256_BLOCK_SIZE);