From b5fe9ba816df9a224cadee2f0972265779f9b6be Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 25 Mar 2024 13:24:50 +0400 Subject: [PATCH] Upgrade OpenSSL to 3.2.1. --- external/openssl/CMakeLists.txt | 6 +++--- external/openssl/openssl_common/CMakeLists.txt | 10 ++++++++-- options_win.cmake | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/external/openssl/CMakeLists.txt b/external/openssl/CMakeLists.txt index 0e0b9d94..f7b94bb8 100644 --- a/external/openssl/CMakeLists.txt +++ b/external/openssl/CMakeLists.txt @@ -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/lib) endif() endif() diff --git a/external/openssl/openssl_common/CMakeLists.txt b/external/openssl/openssl_common/CMakeLists.txt index 07548fa3..85242225 100644 --- a/external/openssl/openssl_common/CMakeLists.txt +++ b/external/openssl/openssl_common/CMakeLists.txt @@ -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() diff --git a/options_win.cmake b/options_win.cmake index 9abba030..814d5345 100644 --- a/options_win.cmake +++ b/options_win.cmake @@ -145,6 +145,7 @@ INTERFACE Wtsapi32 Crypt32 Propsys + Bcrypt ) if (build_winstore)