Upgrade OpenSSL to 3.2.1.

desktop-app · Mar 25, 2024 · 161b986 · 161b986
1 parent 95c83fd
commit 161b986
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git 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/lib64)
     endif()
 endif()
 

diff --git 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
@@ -145,6 +145,7 @@ INTERFACE
     Wtsapi32
     Crypt32
     Propsys
+    Bcrypt
 )
 
 if (build_winstore)
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,6 +145,7 @@ INTERFACE @@
         Wtsapi32
         Crypt32
         Propsys
+        Bcrypt
     )
     if (build_winstore)
@@ Expand Down @@