Android: Update CMakeLists.txt for FIPS Ready, add WOLFSSL_ALWAYS_KEEP_SNI
parent
acdbb9c6a6
commit
799b277531
|
|
@ -120,16 +120,16 @@ elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready")
|
|||
|
||||
if("${ANDROID_ABI}" MATCHES "arm64-v8a")
|
||||
# https://developer.android.com/ndk/guides/abis#arm64-v8a
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=DF2FF40654C405467072356FBA6C02A88F17E79B08A1A8F3A887C0F6AB4E4650)
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=0C1CB1086D64FCD5AB5F7A0A8127244CE8D891CA5542B02FA4B9D81FD35C5C8A)
|
||||
elseif("${ANDROID_ABI}" MATCHES "armeabi-v7a")
|
||||
# https://developer.android.com/ndk/guides/abis#v7a
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=DF2FF40654C405467072356FBA6C02A88F17E79B08A1A8F3A887C0F6AB4E4650)
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=0C1CB1086D64FCD5AB5F7A0A8127244CE8D891CA5542B02FA4B9D81FD35C5C8A)
|
||||
elseif("${ANDROID_ABI}" MATCHES "x86_64")
|
||||
# https://developer.android.com/ndk/guides/abis#86-64
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=DF2FF40654C405467072356FBA6C02A88F17E79B08A1A8F3A887C0F6AB4E4650)
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=0C1CB1086D64FCD5AB5F7A0A8127244CE8D891CA5542B02FA4B9D81FD35C5C8A)
|
||||
elseif("${ANDROID_ABI}" MATCHES "x86")
|
||||
# https://developer.android.com/ndk/guides/abis#x86
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=DF2FF40654C405467072356FBA6C02A88F17E79B08A1A8F3A887C0F6AB4E4650)
|
||||
add_definitions(-DWOLFCRYPT_FIPS_CORE_HASH_VALUE=0C1CB1086D64FCD5AB5F7A0A8127244CE8D891CA5542B02FA4B9D81FD35C5C8A)
|
||||
endif()
|
||||
|
||||
# Add preprocessor defines to CFLAGS, these match those placed into
|
||||
|
|
@ -156,8 +156,8 @@ elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready")
|
|||
-DHAVE_OCSP -DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER
|
||||
-DWOLFSSL_CERT_EXT -DWOLFSSL_CERT_GEN -DWOLFSSL_CERT_REQ -DWOLFSSL_KEY_GEN
|
||||
-DHAVE_ALPN -DWOLFSSL_ALT_CERT_CHAINS -DSESSION_CERTS -DWOLFSSL_ENCRYPTED_KEYS
|
||||
-DWOLFSSL_SYS_CA_CERTS -DWOLFSSL_ALT_NAMES -DWOLFSSL_EITHER_SIDE
|
||||
-DWOLFSSL_TICKET_HAVE_ID -DWOLFSSL_CERT_NAME_ALL
|
||||
-DWOLFSSL_SYS_CA_CERTS -DWOLFSSL_ALT_NAMES -DWOLFSSL_ALWAYS_KEEP_SNI
|
||||
-DWOLFSSL_EITHER_SIDE -DWOLFSSL_TICKET_HAVE_ID -DWOLFSSL_CERT_NAME_ALL
|
||||
-DHAVE_SERVER_RENEGOTIATION_INFO -DWOLFSSL_ASN_TEMPLATE -DWOLFSSL_ASN_PRINT
|
||||
-DWOLFSSL_BASE64_ENCODE -DERROR_QUEUE_PER_THREAD -DNO_ERROR_QUEUE
|
||||
-DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT -DWOLFSSL_USE_ALIGN
|
||||
|
|
|
|||
Loading…
Reference in New Issue