Commit 8c47e25c authored by johan's avatar johan

Fix build without mbedtls

parent b022d9c8
...@@ -35,9 +35,6 @@ set(BCTOOLBOX_CXX_SOURCE_FILES ...@@ -35,9 +35,6 @@ set(BCTOOLBOX_CXX_SOURCE_FILES
conversion/charconv_encoding.cc conversion/charconv_encoding.cc
utils/exception.cc utils/exception.cc
utils/regex.cc utils/regex.cc
vfs/vfs_encrypted.cc
vfs/vfs_encryption_module_dummy.cc
vfs/vfs_encryption_module_aes256gcm_sha256.cc
) )
set(BCTOOLBOX_PRIVATE_HEADER_FILES set(BCTOOLBOX_PRIVATE_HEADER_FILES
...@@ -72,7 +69,11 @@ if(MBEDTLS_FOUND OR POLARSSL_FOUND) ...@@ -72,7 +69,11 @@ if(MBEDTLS_FOUND OR POLARSSL_FOUND)
endif() endif()
if(MBEDTLS_FOUND) if(MBEDTLS_FOUND)
list(APPEND BCTOOLBOX_C_SOURCE_FILES crypto/mbedtls.c) list(APPEND BCTOOLBOX_C_SOURCE_FILES crypto/mbedtls.c)
list(APPEND BCTOOLBOX_CXX_SOURCE_FILES crypto/mbedtls.cc) list(APPEND BCTOOLBOX_CXX_SOURCE_FILES
crypto/mbedtls.cc
vfs/vfs_encrypted.cc
vfs/vfs_encryption_module_dummy.cc
vfs/vfs_encryption_module_aes256gcm_sha256.cc)
endif() endif()
if(POLARSSL_FOUND) if(POLARSSL_FOUND)
list(APPEND BCTOOLBOX_C_SOURCE_FILES crypto/polarssl.c) list(APPEND BCTOOLBOX_C_SOURCE_FILES crypto/polarssl.c)
......
...@@ -33,10 +33,11 @@ if(ENABLE_TESTS AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ...@@ -33,10 +33,11 @@ if(ENABLE_TESTS AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
containers.cc containers.cc
port.c port.c
parser.c parser.c
encrypted_vfs.cc
) )
if(MBEDTLS_FOUND OR POLARSSL_FOUND) if(MBEDTLS_FOUND OR POLARSSL_FOUND)
list(APPEND TESTER_SOURCES crypto.cc) list(APPEND TESTER_SOURCES
crypto.cc
encrypted_vfs.cc)
endif() endif()
if(APPLE) if(APPLE)
list(APPEND TESTER_SOURCES ios_utils.cc) list(APPEND TESTER_SOURCES ios_utils.cc)
......
...@@ -47,12 +47,12 @@ void bctoolbox_tester_init(void(*ftester_printf)(int level, const char *fmt, va_ ...@@ -47,12 +47,12 @@ void bctoolbox_tester_init(void(*ftester_printf)(int level, const char *fmt, va_
bc_tester_add_suite(&utils_test_suite); bc_tester_add_suite(&utils_test_suite);
#if (HAVE_MBEDTLS | HAVE_POLARSSL) #if (HAVE_MBEDTLS | HAVE_POLARSSL)
bc_tester_add_suite(&crypto_test_suite); bc_tester_add_suite(&crypto_test_suite);
bc_tester_add_suite(&encrypted_vfs_test_suite);
#endif #endif
bc_tester_add_suite(&parser_test_suite); bc_tester_add_suite(&parser_test_suite);
#ifdef __APPLE__ #ifdef __APPLE__
bc_tester_add_suite(&ios_utils_test_suite); bc_tester_add_suite(&ios_utils_test_suite);
#endif #endif
bc_tester_add_suite(&encrypted_vfs_test_suite);
} }
void bctoolbox_tester_uninit(void) { void bctoolbox_tester_uninit(void) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment