diff options
| -rw-r--r-- | cmake/dependencies/openssl.cmake | 7 | ||||
| -rw-r--r-- | src/lib/tests/crypt_test.c | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/cmake/dependencies/openssl.cmake b/cmake/dependencies/openssl.cmake index 19edfa2b..d679b050 100644 --- a/cmake/dependencies/openssl.cmake +++ b/cmake/dependencies/openssl.cmake @@ -9,9 +9,6 @@ if (OPENSSL_FOUND) if (NOT DISABLE_OPENSSL) message(STATUS "OpenSSL support enabled") set(HAVE_OPENSSL TRUE CACHE INTERNAL "") - set(IRMD_SECMEM_MAX 1048576 CACHE STRING "IRMd secure heap size") - set(PROC_SECMEM_MAX 1048576 CACHE STRING "Process secure heap size") - set(SECMEM_GUARD 32 CACHE STRING "Secure heap min size") set(DISABLE_PQC FALSE CACHE BOOL "Disable post-quantum cryptography support") if (OPENSSL_VERSION VERSION_GREATER_EQUAL "3.4.0") if (NOT DISABLE_PQC) @@ -38,4 +35,8 @@ else() set(OPENSSL_CRYPTO_LIBRARY "") endif () +set(IRMD_SECMEM_MAX 1048576 CACHE STRING "IRMd secure heap size") +set(PROC_SECMEM_MAX 1048576 CACHE STRING "Process secure heap size") +set(SECMEM_GUARD 32 CACHE STRING "Secure heap min size") + mark_as_advanced(OPENSSL_LIBRARIES OPENSSL_CRYPTO_LIBRARY) diff --git a/src/lib/tests/crypt_test.c b/src/lib/tests/crypt_test.c index e1232b8c..e250ad2a 100644 --- a/src/lib/tests/crypt_test.c +++ b/src/lib/tests/crypt_test.c @@ -444,11 +444,16 @@ int crypt_test(int argc, ret |= test_crypt_create_destroy(); ret |= test_encrypt_decrypt_all(); - ret |= test_key_rotation(); - ret |= test_key_phase_bit(); #ifdef HAVE_OPENSSL ret |= test_cipher_nid_values(); ret |= test_md_nid_values(); + ret |= test_key_rotation(); + ret |= test_key_phase_bit(); +#else + (void) test_key_rotation; + (void) test_key_phase_bit; + + return TEST_RC_SKIP; #endif return ret; } |