Skip to content

Commit 2cac245

Browse files
Tweaked Conan scripts to build against openssl3.6.0
Signed-off-by: Pratik Mankawde <pmankawde@ripple.com>
1 parent ceb0ce5 commit 2cac245

File tree

5 files changed

+770
-2
lines changed

5 files changed

+770
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ endif()
8585
###
8686

8787
include(deps/Boost)
88-
find_package(OpenSSL 1.1.1 REQUIRED)
88+
find_package(OpenSSL 3.6.0 REQUIRED)
8989
set_target_properties(OpenSSL::SSL PROPERTIES
9090
INTERFACE_COMPILE_DEFINITIONS OPENSSL_NO_SSL2
9191
)

conan.lock

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"version": "0.5",
3+
"requires": [
4+
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497",
5+
"xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1756234289.683",
6+
"sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1756234266.869",
7+
"soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1756234262.318",
8+
"snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1756234314.246",
9+
"rocksdb/10.0.1#85537f46e538974d67da0c3977de48ac%1756234304.347",
10+
"re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1756234257.976",
11+
"protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1756234251.614",
12+
"openssl/3.6.0",
13+
"nudb/2.0.9#c62cfd501e57055a7e0d8ee3d5e5427d%1756234237.107",
14+
"lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1756234228.999",
15+
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1756223727.64",
16+
"libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1756230911.03",
17+
"libarchive/3.8.1#5cf685686322e906cb42706ab7e099a8%1756234256.696",
18+
"jemalloc/5.3.0#e951da9cf599e956cebc117880d2d9f8%1729241615.244",
19+
"grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1756234248.958",
20+
"doctest/2.4.11#a4211dfc329a16ba9f280f9574025659%1756234220.819",
21+
"date/3.0.4#f74bbba5a08fa388256688743136cb6f%1756234217.493",
22+
"c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1756234217.915",
23+
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1756234261.716",
24+
"boost/1.88.0#8852c0b72ce8271fb8ff7c53456d4983%1756223752.326",
25+
"abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1756234220.907"
26+
],
27+
"build_requires": [
28+
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497",
29+
"strawberryperl/5.32.1.1#707032463aa0620fa17ec0d887f5fe41%1756234281.733",
30+
"protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1756234251.614",
31+
"nasm/2.16.01#31e26f2ee3c4346ecd347911bd126904%1756234232.901",
32+
"msys2/cci.latest#5b73b10144f73cc5bfe0572ed9be39e1%1751977009.857",
33+
"m4/1.4.19#b38ced39a01e31fef5435bc634461fd2%1700758725.451",
34+
"cmake/3.31.8#dde3bde00bb843687e55aea5afa0e220%1756234232.89",
35+
"b2/5.3.3#107c15377719889654eb9a162a673975%1756234226.28",
36+
"automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
37+
"autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86"
38+
],
39+
"python_requires": [],
40+
"overrides": {
41+
"protobuf/3.21.12": [
42+
null,
43+
"protobuf/3.21.12"
44+
],
45+
"lz4/1.9.4": [
46+
"lz4/1.10.0"
47+
],
48+
"boost/1.83.0": [
49+
"boost/1.88.0"
50+
],
51+
"sqlite3/3.44.2": [
52+
"sqlite3/3.49.1"
53+
]
54+
},
55+
"config_requires": []
56+
}

conanfile.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from conan import ConanFile, __version__ as conan_version
22
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
33
import re
4+
import subprocess
45

56
class Xrpl(ConanFile):
67
name = 'xrpl'
@@ -27,7 +28,7 @@ class Xrpl(ConanFile):
2728
'grpc/1.50.1',
2829
'libarchive/3.8.1',
2930
'nudb/2.0.9',
30-
'openssl/1.1.1w',
31+
'openssl/3.6.0',
3132
'soci/4.0.3',
3233
'zlib/1.3.1',
3334
]
@@ -89,6 +90,7 @@ class Xrpl(ConanFile):
8990
}
9091

9192
def set_version(self):
93+
subprocess.run(["conan", "export", f'{self.recipe_folder}/external/openssl-3.6.0/'])
9294
if self.version is None:
9395
path = f'{self.recipe_folder}/src/libxrpl/protocol/BuildInfo.cpp'
9496
regex = r'versionString\s?=\s?\"(.*)\"'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Versions to keep:
2+
# - The last patch version of the supported releases, as per https://openssl-library.org/source/
3+
# - The last patch version of the current LTS release
4+
# - The most recent FIPS validated version
5+
# Note: please do not maintain multiple patch versions of the same minor,
6+
# unless required by the above.
7+
sources:
8+
3.6.0: # pre-release
9+
url: "https://github.com/openssl/openssl/releases/download/openssl-3.6.0-beta1/openssl-3.6.0-beta1.tar.gz"
10+
sha256: 1cfcda5da5d7221861749113b5090038588784e82a3ba5f893e0c347e5bb1626
11+
3.5.2: # LTS: keep until next LTS is designed
12+
url: "https://github.com/openssl/openssl/releases/download/openssl-3.5.2/openssl-3.5.2.tar.gz"
13+
sha256: c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec
14+
3.4.2:
15+
url: "https://github.com/openssl/openssl/releases/download/openssl-3.4.2/openssl-3.4.2.tar.gz"
16+
sha256: 17b02459fc28be415470cccaae7434f3496cac1306b86b52c83886580e82834c
17+
3.3.4:
18+
url: "https://github.com/openssl/openssl/releases/download/openssl-3.3.4/openssl-3.3.4.tar.gz"
19+
sha256: 8d1a5fc323d3fd351dc05458457fd48f78652d2a498e1d70ffea07b4d0eb3fa8
20+
3.2.5:
21+
url: "https://github.com/openssl/openssl/releases/download/openssl-3.2.5/openssl-3.2.5.tar.gz"
22+
sha256: b36347d024a0f5bd09fefcd6af7a58bb30946080eb8ce8f7be78562190d09879
23+
3.1.2: # Most recent FIPS validated as of 2025-03-14
24+
url: "https://github.com/openssl/openssl/releases/download/openssl-3.1.2/openssl-3.1.2.tar.gz"
25+
sha256: a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539
26+
3.0.17: # LTS: 3.5.1 should be used, but this is supported by OpenSSL until 2026-09-07
27+
url: "https://github.com/openssl/openssl/releases/download/openssl-3.0.17/openssl-3.0.17.tar.gz"
28+
sha256: dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce

0 commit comments

Comments
 (0)