Skip to content

Commit b5fe9ba

Browse files
committed
Upgrade OpenSSL to 3.2.1.
1 parent 95c83fd commit b5fe9ba

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

external/openssl/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ add_library(desktop-app::external_openssl ALIAS external_openssl)
99

1010
if (WIN32)
1111
set(openssl_lib_ext lib)
12-
set(openssl_lib_loc ${libs_loc}/openssl/out)
12+
set(openssl_lib_loc ${libs_loc}/openssl3/out)
1313
else()
1414
set(openssl_lib_ext a)
1515
if (APPLE)
16-
set(openssl_lib_loc ${libs_loc}/openssl)
16+
set(openssl_lib_loc ${libs_loc}/openssl3)
1717
else()
18-
set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib)
18+
set(openssl_lib_loc /usr/local/desktop-app/openssl-3.2.1/lib)
1919
endif()
2020
endif()
2121

external/openssl/openssl_common/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
1111
if (LINUX)
1212
target_include_directories(external_openssl_common SYSTEM
1313
INTERFACE
14-
/usr/local/desktop-app/openssl-1.1.1/include
14+
/usr/local/desktop-app/openssl-3.2.1/include
1515
)
1616
else()
1717
target_include_directories(external_openssl_common SYSTEM
1818
INTERFACE
19-
${libs_loc}/openssl/include
19+
${libs_loc}/openssl3/include
2020
)
2121
endif()
22+
23+
# OpenSSL 3 deprecated AES_set_encrypt_key/decrypt_key/ige_encrypt/cbc_encrypt
24+
target_compile_options_if_exists(external_openssl_common
25+
INTERFACE
26+
-Wno-deprecated-declarations
27+
)
2228
endif()

options_win.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ INTERFACE
145145
Wtsapi32
146146
Crypt32
147147
Propsys
148+
Bcrypt
148149
)
149150

150151
if (build_winstore)

0 commit comments

Comments
 (0)