Skip to content

Commit 08b1365

Browse files
authored
Revert "Update Conan dependencies: OpenSSL" (#5807)
This change reverts #5617, because it will require extensive testing that will take up more time than we have before the next scheduled release. Reverting this change does not mean we are abandoning it. We aim to pick it back up once there's a sufficient time window to allow for testing on multiple distros running a mixture of OpenSSL 1.x and 3.x.
1 parent 6b8a589 commit 08b1365

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

cmake/RippledCompiler.cmake

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,13 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1616
target_compile_definitions (common
1717
INTERFACE
1818
$<$<CONFIG:Debug>:DEBUG _DEBUG>
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-
)
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
2926

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

conan.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"rocksdb/10.0.1#85537f46e538974d67da0c3977de48ac%1756234304.347",
1010
"re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1756234257.976",
1111
"protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1756234251.614",
12-
"openssl/3.5.2#0c5a5e15ae569f45dff57adcf1770cf7%1756234259.61",
12+
"openssl/1.1.1w#a8f0792d7c5121b954578a7149d23e03%1756223730.729",
1313
"nudb/2.0.9#c62cfd501e57055a7e0d8ee3d5e5427d%1756234237.107",
1414
"lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1756234228.999",
1515
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1756223727.64",

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/3.5.2',
30+
'openssl/1.1.1w',
3131
'soci/4.0.3',
3232
'zlib/1.3.1',
3333
]

0 commit comments

Comments
 (0)