ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-15 16:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Conan dependencies: OpenSSL (#5617)

Browse Source 
This change updates OpenSSL from 1.1.1w to 3.5.2. The code works as-is, but many functions have been marked as deprecated and thus will need to be rewritten. For now we explicitly add the `-DOPENSSL_SUPPRESS_DEPRECATED` to give us time to do so, while providing us with the benefits of the updated version.
This commit is contained in:
Bart
2025-08-21 07:41:00 -04:00
committed by GitHub
parent 56c1e078f2
commit f847e3287c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/RippledCompiler.cmake
View File

@@ -16,13 +16,16 @@ set(CMAKE_CXX_EXTENSIONS OFF)
target_compile_definitions (common target_compile_definitions (common
INTERFACE INTERFACE
$<$<CONFIG:Debug>:DEBUG _DEBUG> $<$<CONFIG:Debug>:DEBUG _DEBUG>
$<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>) #[===[
# ^^^^ NOTE: CMAKE release builds already have NDEBUG NOTE: CMAKE release builds already have NDEBUG defined, so no need to add it
# defined, so no need to add it explicitly except for explicitly except for the special case of (profile ON) and (assert OFF).
# this special case of (profile ON) and (assert OFF) Presumably this is because we don't want profile builds asserting unless
# -- presumably this is because we don't want profile asserts were specifically requested.
# builds asserting unless asserts were specifically ]===]
# requested $<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>
# TODO: Remove once we have migrated functions from OpenSSL 1.x to 3.x.
OPENSSL_SUPPRESS_DEPRECATED
)
if (MSVC) if (MSVC)
# remove existing exception flag since we set it to -EHa # remove existing exception flag since we set it to -EHa

2
conanfile.py
View File

@@ -27,7 +27,7 @@ class Xrpl(ConanFile):
'grpc/1.50.1', 'grpc/1.50.1',
'libarchive/3.8.1', 'libarchive/3.8.1',
'nudb/2.0.9', 'nudb/2.0.9',
'openssl/1.1.1w', 'openssl/3.5.2',
'soci/4.0.3', 'soci/4.0.3',
'zlib/1.3.1', 'zlib/1.3.1',
] ]