Skip to content

upgrade openssl version from 1.1.1 to 3.0.13 #1096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −17
Open

upgrade openssl version from 1.1.1 to 3.0.13 #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Server/Source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if(MSVC)
winmm
)
else()
target_link_libraries(Server PRIVATE dl)
target_link_libraries(Server PRIVATE dl atomic)

if(SHARED_STDCXXFS)
target_link_libraries(Server PRIVATE stdc++fs)
Expand Down
17 changes: 3 additions & 14 deletions docker/run_ubuntu-22.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,9 @@ RUN \
wget \
libstdc++6:i386 \
tzdata \
&& \
wget \
http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \
-P /tmp \
&& \
dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb && \
wget \
http://security.ubuntu.com/ubuntu/pool/main/o/openssl/openssl_1.1.1f-1ubuntu2.16_i386.deb \
-P /tmp \
&& \
dpkg -i /tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb && \
rm \
/tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \
/tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb \
openssl \
libssl3 \
libssl-dev \
&& \
useradd -m user

Expand Down
4 changes: 2 additions & 2 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ conan_omp_add_lib(nlohmann_json 3.9.1)
# -------
if(SHARED_OPENSSL)
message("Using shared OpenSSL")
conan_omp_add_lib_opt(openssl 1.1.1q "openssl:shared=True")
conan_omp_add_lib_opt(openssl 3.0.13 "openssl:shared=True")
else()
message("Using static OpenSSL")
conan_omp_add_lib(openssl 1.1.1q)
conan_omp_add_lib(openssl 3.0.13)
endif()

# ghc-filesystem
Expand Down
Loading