From 5dc1732036ddcee4f9ad353f735a3dd2defc5908 Mon Sep 17 00:00:00 2001
From: Sean Parkinson <sean@wolfssl.com>
Date: Thu, 8 Sep 2022 08:39:00 +1000
Subject: [PATCH] Fix define name

WOLFSSL_ARMASM_NO_CRYPTO -> WOLFSSL_ARMASM_NO_HW_CRYPTO
---
 configure.ac                          | 2 +-
 wolfcrypt/src/aes.c                   | 6 +++---
 wolfcrypt/src/port/arm/armv8-aes.c    | 2 +-
 wolfcrypt/src/port/arm/armv8-sha256.c | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 739617392..a8cc754f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2081,7 +2081,7 @@ then
             AC_MSG_NOTICE([64bit ARMv8 found, setting mcpu to generic+crypto])
             ;;
         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
             AM_CCASFLAGS="$AM_CCASFLAGS -DEXTERNAL_OPTS_OPENVPN"
             ENABLED_ARMASM_CRYPTO=no
diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index e8fa52d22..952deea4f 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -306,7 +306,7 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits
     #include <wolfcrypt/src/misc.c>
 #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
     /* 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
 
-#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 */
 
 #elif defined(WOLFSSL_AFALG)
@@ -9933,7 +9933,7 @@ int wc_AesCcmCheckTagSize(int sz)
     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 */
 
 #elif defined(HAVE_COLDFIRE_SEC)
diff --git a/wolfcrypt/src/port/arm/armv8-aes.c b/wolfcrypt/src/port/arm/armv8-aes.c
index 0056a3ccb..49e78606f 100644
--- a/wolfcrypt/src/port/arm/armv8-aes.c
+++ b/wolfcrypt/src/port/arm/armv8-aes.c
@@ -33,7 +33,7 @@
 #include <wolfssl/wolfcrypt/settings.h>
 
 #if !defined(NO_AES) && defined(WOLFSSL_ARMASM) && \
-    !defined(WOLFSSL_ARMASM_NO_CRYPTO)
+    !defined(WOLFSSL_ARMASM_NO_HW_CRYPTO)
 
 #ifdef HAVE_FIPS
 #undef HAVE_FIPS
diff --git a/wolfcrypt/src/port/arm/armv8-sha256.c b/wolfcrypt/src/port/arm/armv8-sha256.c
index 730f5c599..ca26e4423 100644
--- a/wolfcrypt/src/port/arm/armv8-sha256.c
+++ b/wolfcrypt/src/port/arm/armv8-sha256.c
@@ -45,7 +45,7 @@
 #endif
 
 
-#ifndef WOLFSSL_ARMASM_NO_CRYPTO
+#ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
 static const ALIGN32 word32 K[64] = {
     0x428A2F98L, 0x71374491L, 0xB5C0FBCFL, 0xE9B5DBA5L, 0x3956C25BL,
     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__
 
@@ -1411,7 +1411,7 @@ static WC_INLINE int Sha256Final(wc_Sha256* sha256, byte* hash)
     return 0;
 }
 
-#endif /* !WOLFSSL_ARMASM_NO_CRYPTO */
+#endif /* !WOLFSSL_ARMASM_NO_HW_CRYPTO */
 
 
 #ifndef NO_SHA256
@@ -1537,7 +1537,7 @@ int wc_Sha256Transform(wc_Sha256* sha256, const unsigned char* data)
 #else
     XMEMCPY(sha256->buffer, data, WC_SHA256_BLOCK_SIZE);
 #endif
-#ifndef WOLFSSL_ARMASM_NO_CRYPTO
+#ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
     Sha256Transform(sha256, data, 1);
 #else
     Transform_Sha256_Len(sha256, data, WC_SHA256_BLOCK_SIZE);