From 730ddccec7a04acece804144017d26df5e7c1361 Mon Sep 17 00:00:00 2001
From: Anthony Hu <anthony@wolfssl.com>
Date: Tue, 1 Feb 2022 17:30:41 -0500
Subject: [PATCH] Bring back defines of NO_<ALG>.

---
 RT1060/user_settings.h                        |  2 ++
 .../app/CMakeLists.txt                        | 10 +++----
 android/wolfssljni-ndk-sample/jni/Android.mk  | 27 +++++++++----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/RT1060/user_settings.h b/RT1060/user_settings.h
index 854be5a0..32aebe85 100644
--- a/RT1060/user_settings.h
+++ b/RT1060/user_settings.h
@@ -89,9 +89,11 @@ int32_t cust_rand_generate_block(uint8_t *rndb, uint32_t sz);
 #define NO_DSA
 #define NO_MD4
 #define NO_DH
+#define NO_RABBIT
 #define NO_SIG_WRAPPER
 #define NO_CERT
 #define NO_SESSION_CACHE
+#define NO_HC128
 #define NO_DES3
 #define WC_NO_HASHDRBG
 #define NO_WRITEV
diff --git a/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt b/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt
index 1ac9eb46..0eb0a514 100644
--- a/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt
+++ b/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt
@@ -6,11 +6,11 @@
 cmake_minimum_required(VERSION 3.4.1)
 
 # Add preprocessor defines to CFLAGS
-add_definitions(-DNO_DSA -DNO_PSK -DNO_MD4 -DWOLFSSL_SHA512 -DWOLFSSL_SHA384
-                -DHAVE_AESGCM -DHAVE_HASHDRBG -DHAVE_ECC -DWOLFSSL_KEY_GEN
-                -DNO_PWDBASED -DUSE_FAST_MATH -DTFM_ECC256 -DHAVE_DH
-                -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT
-                -DWC_RSA_BLINDING -DTFM_NO_ASM
+add_definitions(-DNO_DSA -DNO_PSK -DNO_MD4 -DNO_HC128 -DNO_RABBIT
+                -DWOLFSSL_SHA512 -DWOLFSSL_SHA384 -DHAVE_AESGCM -DHAVE_HASHDRBG
+                -DHAVE_ECC -DWOLFSSL_KEY_GEN -DNO_PWDBASED -DUSE_FAST_MATH
+                -DTFM_ECC256 -DHAVE_DH -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT
+                -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING -DTFM_NO_ASM
                 )
 
 # set wolfSSL JNI location as environment variable, change if needed
diff --git a/android/wolfssljni-ndk-sample/jni/Android.mk b/android/wolfssljni-ndk-sample/jni/Android.mk
index 8be4f617..962cee88 100644
--- a/android/wolfssljni-ndk-sample/jni/Android.mk
+++ b/android/wolfssljni-ndk-sample/jni/Android.mk
@@ -9,15 +9,13 @@ LOCAL_MODULE    := libwolfssl
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
-				-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE \
-				-DATOMIC_USER -DHAVE_PK_CALLBACKS -DNO_DSA \
-				-DHAVE_ECC -DTFM_ECC256 -DECC_SHAMIR -DNO_MD4 \
+				-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
+				-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
+				-DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
 				-DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
-				-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT \
-				-DECC_TIMING_RESISTANT -DWC_RSA_BLINDING \
-				-DTFM_NO_ASM \
+				-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT \
+				-DWC_RSA_BLINDING -DTFM_NO_ASM \
 				-Wall
-
 LOCAL_SRC_FILES := src/crl.c \
 				   src/internal.c \
 				   src/io.c \
@@ -91,11 +89,11 @@ LOCAL_SRC_FILES  := native/com_wolfssl_WolfSSL.c \
 LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
 				-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
 				-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-				-DECC_SHAMIR -DNO_MD4 -DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI \
-                                -DHAVE_DH -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT \
-                                -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING -DTFM_NO_ASM \
+				-DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
+				-DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
+				-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT \
+				-DWC_RSA_BLINDING -DTFM_NO_ASM \
 				-Wall
-
 LOCAL_SHARED_LIBRARIES := libwolfssl
 include $(BUILD_SHARED_LIBRARY)
 
@@ -108,9 +106,10 @@ LOCAL_SRC_FILES := jnitest.c
 LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
 				-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
 				-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-				-DECC_SHAMIR -DNO_MD4 -DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI \
-				-DHAVE_DH -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT \
-				-DECC_TIMING_RESISTANT -DWC_RSA_BLINDING -DTFM_NO_ASM \
+				-DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
+				-DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
+				-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT \
+				-DWC_RSA_BLINDING -DTFM_NO_ASM \
 				-Wall
 
 LOCAL_SHARED_LIBRARIES := libwolfssl