Skip to content

Commit

Permalink
chore(deps): Update Libressl to 3.8.2 (#662)
Browse files Browse the repository at this point in the history
* chore(deps): Update Libressl to 3.8.2

* Fix: Adapt patch to newest LibreSSL ersion

---------

Co-authored-by: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
  • Loading branch information
GoetzGoerisch and ccvca authored Dec 8, 2023
1 parent 01fb596 commit 5638efd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ externalproject_add(
libreSSLExternal
DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslDownload
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource
URL "https://mirror.leaseweb.com/pub/OpenBSD/LibreSSL/libressl-3.7.2.tar.gz"
URL_HASH SHA256=b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7
URL "https://mirror.leaseweb.com/pub/OpenBSD/LibreSSL/libressl-3.8.2.tar.gz"
URL_HASH SHA256=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954
PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 --forward -d ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource <
${CMAKE_CURRENT_SOURCE_DIR}/ciPatches/libressl-no_postfix.patch || echo "Patch returned non-zero"
CMAKE_ARGS -DLIBRESSL_APPS:BOOL=0
Expand Down
6 changes: 3 additions & 3 deletions .github/ciPatches/libressl-no_postfix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ index b1ded85..50f934a 100644
export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
target_link_libraries(crypto ${PLATFORM_LIBS})
if (WIN32)
- set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})
- set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION} PARENT_SCOPE)
+ set(CRYPTO_POSTFIX "")
endif()
set_target_properties(crypto PROPERTIES
Expand All @@ -19,7 +19,7 @@ index 3310931..0066bff 100644
export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
target_link_libraries(ssl crypto ${PLATFORM_LIBS})
if (WIN32)
- set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
- set(SSL_POSTFIX -${SSL_MAJOR_VERSION} PARENT_SCOPE)
+ set(SSL_POSTFIX "")
endif()
set_target_properties(ssl PROPERTIES
Expand All @@ -32,7 +32,7 @@ index 9aa10e1..c0547b2 100644
export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym)
target_link_libraries(tls ${PLATFORM_LIBS})
if (WIN32)
- set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
- set(TLS_POSTFIX -${TLS_MAJOR_VERSION} PARENT_SCOPE)
+ set(TLS_POSTFIX "")
endif()
set_target_properties(tls PROPERTIES
Expand Down

0 comments on commit 5638efd

Please sign in to comment.