1
0
Fork 0

Upgrade OpenSSL to 3.2.1.

This commit is contained in:
John Preston 2024-03-25 13:24:50 +04:00
parent 95c83fd264
commit 161b986c32
3 changed files with 12 additions and 5 deletions

View file

@ -9,13 +9,13 @@ add_library(desktop-app::external_openssl ALIAS external_openssl)
if (WIN32)
set(openssl_lib_ext lib)
set(openssl_lib_loc ${libs_loc}/openssl/out)
set(openssl_lib_loc ${libs_loc}/openssl3/out)
else()
set(openssl_lib_ext a)
if (APPLE)
set(openssl_lib_loc ${libs_loc}/openssl)
set(openssl_lib_loc ${libs_loc}/openssl3)
else()
set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib)
set(openssl_lib_loc /usr/local/desktop-app/openssl-3.2.1/lib64)
endif()
endif()

View file

@ -11,12 +11,18 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
if (LINUX)
target_include_directories(external_openssl_common SYSTEM
INTERFACE
/usr/local/desktop-app/openssl-1.1.1/include
/usr/local/desktop-app/openssl-3.2.1/include
)
else()
target_include_directories(external_openssl_common SYSTEM
INTERFACE
${libs_loc}/openssl/include
${libs_loc}/openssl3/include
)
endif()
# OpenSSL 3 deprecated AES_set_encrypt_key/decrypt_key/ige_encrypt/cbc_encrypt
target_compile_options_if_exists(external_openssl_common
INTERFACE
-Wno-deprecated-declarations
)
endif()

View file

@ -145,6 +145,7 @@ INTERFACE
Wtsapi32
Crypt32
Propsys
Bcrypt
)
if (build_winstore)