Skip to content

Commit

Permalink
Upgrade OpenSSL to 3.2.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Mar 25, 2024
1 parent 95c83fd commit b5fe9ba
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
6 changes: 3 additions & 3 deletions external/openssl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
10 changes: 8 additions & 2 deletions external/openssl/openssl_common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 1 addition & 0 deletions options_win.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ INTERFACE
Wtsapi32
Crypt32
Propsys
Bcrypt
)

if (build_winstore)
Expand Down

0 comments on commit b5fe9ba

Please sign in to comment.