Skip to content

Commit f847e32

Browse files
authored
Update Conan dependencies: OpenSSL (#5617)
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.
1 parent 56c1e07 commit f847e32

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

cmake/RippledCompiler.cmake

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1616
target_compile_definitions (common
1717
INTERFACE
1818
$<$<CONFIG:Debug>:DEBUG _DEBUG>
19-
$<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>)
20-
# ^^^^ NOTE: CMAKE release builds already have NDEBUG
21-
# defined, so no need to add it explicitly except for
22-
# this special case of (profile ON) and (assert OFF)
23-
# -- presumably this is because we don't want profile
24-
# builds asserting unless asserts were specifically
25-
# requested
19+
#[===[
20+
NOTE: CMAKE release builds already have NDEBUG defined, so no need to add it
21+
explicitly except for the special case of (profile ON) and (assert OFF).
22+
Presumably this is because we don't want profile builds asserting unless
23+
asserts were specifically requested.
24+
]===]
25+
$<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>
26+
# TODO: Remove once we have migrated functions from OpenSSL 1.x to 3.x.
27+
OPENSSL_SUPPRESS_DEPRECATED
28+
)
2629

2730
if (MSVC)
2831
# remove existing exception flag since we set it to -EHa

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Xrpl(ConanFile):
2727
'grpc/1.50.1',
2828
'libarchive/3.8.1',
2929
'nudb/2.0.9',
30-
'openssl/1.1.1w',
30+
'openssl/3.5.2',
3131
'soci/4.0.3',
3232
'zlib/1.3.1',
3333
]

0 commit comments

Comments
 (0)