From c1092e8f535167dd0aa895db4535d4cc9d25cb5b Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Fri, 29 Sep 2023 11:19:04 -0600 Subject: [PATCH] Android: fix DEBUG_WOLFSSL in CMakeLists.txt, remove NO_FILESYSTEM --- android/wolfssljni-ndk-gradle/app/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/android/wolfssljni-ndk-gradle/app/CMakeLists.txt b/android/wolfssljni-ndk-gradle/app/CMakeLists.txt index 492b56a8..e3191fe9 100644 --- a/android/wolfssljni-ndk-gradle/app/CMakeLists.txt +++ b/android/wolfssljni-ndk-gradle/app/CMakeLists.txt @@ -62,12 +62,15 @@ if ("${WOLFSSL_PKG_TYPE}" MATCHES "normal") # Defines added for debugging. These can be removed if debug logging is not needed # and will increase performance and reduce library footprint size if removed. - -DEBUG_WOLFSSL + -DDEBUG_WOLFSSL -DWOLFSSL_ANDROID_DEBUG # Defines added for wolfCrypt test and benchmark only, may not be needed for your # own application. - -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DNO_WRITE_TEMP_FILES - -DNO_FILESYSTEM -DNO_MAIN_DRIVER + # Add -DNO_FILESYSTEM to disable file system use for wolfCrypt test, but make sure + # to remove this define in production applications as filesystem access is required + # for wolfJSSE use. + -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 + -DNO_WRITE_TEMP_FILES -DNO_MAIN_DRIVER ) elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready") @@ -116,7 +119,10 @@ elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready") # Below options are added only for wolfCrypt test and benchmark applications. # These can be left off / removed when integrating into a real-world application. - -DNO_FILESYSTEM -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 + # Add -DNO_FILESYSTEM to disable file system use for wolfCrypt test, but make sure + # to remove this define in production applications as filesystem access is required + # for wolfJSSE use. + -DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DNO_WRITE_TEMP_FILES -DNO_MAIN_DRIVER ) endif()