Bring back defines of NO_<ALG>.

pull/286/head
Anthony Hu 2022-02-01 17:30:41 -05:00
parent c95798f240
commit 730ddccec7
3 changed files with 20 additions and 19 deletions

View File

@ -89,9 +89,11 @@ int32_t cust_rand_generate_block(uint8_t *rndb, uint32_t sz);
#define NO_DSA #define NO_DSA
#define NO_MD4 #define NO_MD4
#define NO_DH #define NO_DH
#define NO_RABBIT
#define NO_SIG_WRAPPER #define NO_SIG_WRAPPER
#define NO_CERT #define NO_CERT
#define NO_SESSION_CACHE #define NO_SESSION_CACHE
#define NO_HC128
#define NO_DES3 #define NO_DES3
#define WC_NO_HASHDRBG #define WC_NO_HASHDRBG
#define NO_WRITEV #define NO_WRITEV

View File

@ -6,11 +6,11 @@
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.4.1)
# Add preprocessor defines to CFLAGS # Add preprocessor defines to CFLAGS
add_definitions(-DNO_DSA -DNO_PSK -DNO_MD4 -DWOLFSSL_SHA512 -DWOLFSSL_SHA384 add_definitions(-DNO_DSA -DNO_PSK -DNO_MD4 -DNO_HC128 -DNO_RABBIT
-DHAVE_AESGCM -DHAVE_HASHDRBG -DHAVE_ECC -DWOLFSSL_KEY_GEN -DWOLFSSL_SHA512 -DWOLFSSL_SHA384 -DHAVE_AESGCM -DHAVE_HASHDRBG
-DNO_PWDBASED -DUSE_FAST_MATH -DTFM_ECC256 -DHAVE_DH -DHAVE_ECC -DWOLFSSL_KEY_GEN -DNO_PWDBASED -DUSE_FAST_MATH
-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT -DTFM_ECC256 -DHAVE_DH -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT
-DWC_RSA_BLINDING -DTFM_NO_ASM -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING -DTFM_NO_ASM
) )
# set wolfSSL JNI location as environment variable, change if needed # set wolfSSL JNI location as environment variable, change if needed

View File

@ -9,15 +9,13 @@ LOCAL_MODULE := libwolfssl
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \ LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE \ -DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
-DATOMIC_USER -DHAVE_PK_CALLBACKS -DNO_DSA \ -DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-DHAVE_ECC -DTFM_ECC256 -DECC_SHAMIR -DNO_MD4 \ -DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
-DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \ -DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT \ -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT \
-DECC_TIMING_RESISTANT -DWC_RSA_BLINDING \ -DWC_RSA_BLINDING -DTFM_NO_ASM \
-DTFM_NO_ASM \
-Wall -Wall
LOCAL_SRC_FILES := src/crl.c \ LOCAL_SRC_FILES := src/crl.c \
src/internal.c \ src/internal.c \
src/io.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 \ LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \ -DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \ -DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-DECC_SHAMIR -DNO_MD4 -DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI \ -DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
-DHAVE_DH -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT \ -DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
-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 -Wall
LOCAL_SHARED_LIBRARIES := libwolfssl LOCAL_SHARED_LIBRARIES := libwolfssl
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@ -108,9 +106,10 @@ LOCAL_SRC_FILES := jnitest.c
LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \ LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \ -DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \ -DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-DECC_SHAMIR -DNO_MD4 -DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI \ -DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
-DHAVE_DH -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT \ -DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
-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 -Wall
LOCAL_SHARED_LIBRARIES := libwolfssl LOCAL_SHARED_LIBRARIES := libwolfssl