mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 20:09:07 +08:00
7a6855abec
* Update s2n's version * Update s2n's version * Update s2n * Update s2n's patch * Update s2n's patch * Update ports/s2n/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update s2n's version * Update s2n's version * Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Update to 1.3.5 * Update to 1.3.5 * Update to 1.3.5 * Update to 1.3.5 Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt (revision 86c857094a2d94fafce15a3d32abb4052e664c5c)
|
|
+++ b/CMakeLists.txt (date 1643340236796)
|
|
@@ -409,32 +409,6 @@
|
|
endif()
|
|
endif()
|
|
|
|
-# Determine if EVP_md5_sha1 is available in libcrypto
|
|
-try_compile(
|
|
- LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH
|
|
- ${CMAKE_BINARY_DIR}
|
|
- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c"
|
|
- LINK_LIBRARIES crypto ${OS_LIBS}
|
|
- CMAKE_FLAGS
|
|
- "-DINCLUDE_DIRECTORIES=$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>"
|
|
-)
|
|
-if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
|
|
- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
|
|
-endif()
|
|
-
|
|
-# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto
|
|
-try_compile(
|
|
- LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX
|
|
- ${CMAKE_BINARY_DIR}
|
|
- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c"
|
|
- LINK_LIBRARIES crypto ${OS_LIBS}
|
|
- CMAKE_FLAGS
|
|
- "-DINCLUDE_DIRECTORIES=$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>"
|
|
-)
|
|
-if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
|
|
- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
|
|
-endif()
|
|
-
|
|
if (S2N_INTERN_LIBCRYPTO)
|
|
if (NOT LibCrypto_STATIC_LIBRARY)
|
|
message(FATAL_ERROR "libcrypto interning requires a static build of libcrypto.a to be available")
|