Skip to content

Commit 2356957

Browse files
committed
upgrade openssl version from 1.1.1 to 3.0.13
1 parent 8f3a310 commit 2356957

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

Server/Source/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if(MSVC)
3535
winmm
3636
)
3737
else()
38-
target_link_libraries(Server PRIVATE dl)
38+
target_link_libraries(Server PRIVATE dl atomic)
3939

4040
if(SHARED_STDCXXFS)
4141
target_link_libraries(Server PRIVATE stdc++fs)

docker/run_ubuntu-22.04/Dockerfile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,9 @@ RUN \
77
wget \
88
libstdc++6:i386 \
99
tzdata \
10-
&& \
11-
wget \
12-
http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \
13-
-P /tmp \
14-
&& \
15-
dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb && \
16-
wget \
17-
http://security.ubuntu.com/ubuntu/pool/main/o/openssl/openssl_1.1.1f-1ubuntu2.16_i386.deb \
18-
-P /tmp \
19-
&& \
20-
dpkg -i /tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb && \
21-
rm \
22-
/tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \
23-
/tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb \
10+
openssl \
11+
libssl3 \
12+
libssl-dev \
2413
&& \
2514
useradd -m user
2615

lib/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ conan_omp_add_lib(nlohmann_json 3.9.1)
118118
# -------
119119
if(SHARED_OPENSSL)
120120
message("Using shared OpenSSL")
121-
conan_omp_add_lib_opt(openssl 1.1.1q "openssl:shared=True")
121+
conan_omp_add_lib_opt(openssl 3.0.13 "openssl:shared=True")
122122
else()
123123
message("Using static OpenSSL")
124-
conan_omp_add_lib(openssl 1.1.1q)
124+
conan_omp_add_lib(openssl 3.0.13)
125125
endif()
126126

127127
# ghc-filesystem

0 commit comments

Comments
 (0)