allows cmake to force crypto linkage. (#4383)

sbiscigl · web-flow · commit 0998358a6ef7 · 2024-02-13T13:15:33.000-08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,7 @@ option(COVERAGE "Enable profiling collection for code coverage calculation" OFF)
 option(S2N_INTEG_TESTS "Enable the integrationv2 tests" OFF)
 option(S2N_FAST_INTEG_TESTS "Enable the integrationv2 with more parallelism, only has effect if S2N_INTEG_TESTS=ON" ON)
 option(S2N_INSTALL_S2NC_S2ND "Install the binaries s2nc and s2nd" OFF)
+option(S2N_USE_CRYPTO_SHARED_LIBS "For S2N to use shared libs in Findcrypto" OFF)
 option(TSAN "Enable ThreadSanitizer to test thread safety" OFF)
 option(ASAN "Enable AddressSanitizer to test memory safety" OFF)
 
diff --git a/cmake/modules/Findcrypto.cmake b/cmake/modules/Findcrypto.cmake
@@ -56,7 +56,7 @@ else()
     )
 
     if (NOT crypto_LIBRARY)
-        if (BUILD_SHARED_LIBS)
+        if (BUILD_SHARED_LIBS OR S2N_USE_CRYPTO_SHARED_LIBS)
             if (crypto_SHARED_LIBRARY)
                 set(crypto_LIBRARY ${crypto_SHARED_LIBRARY})
             else()

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ else()`
`56`	`56`	`)`
`57`	`57`
`58`	`58`	`if (NOT crypto_LIBRARY)`
`59`		`- if (BUILD_SHARED_LIBS)`
	`59`	`+ if (BUILD_SHARED_LIBS OR S2N_USE_CRYPTO_SHARED_LIBS)`
`60`	`60`	`if (crypto_SHARED_LIBRARY)`
`61`	`61`	`set(crypto_LIBRARY ${crypto_SHARED_LIBRARY})`
`62`	`62`	`else()`