drop openssl in favor of libressl

koreader · Dec 29, 2024 · 9c75c5a · 9c75c5a
1 parent b0c2c89
commit 9c75c5a
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 210 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -172,7 +172,7 @@ set(crengine_BINARY_DIR ${crengine_CMAKE_BINARY_DIR}/build)
 declare_project(thirdparty/cpu_features EXCLUDE_FROM_ALL)
 
 # curl
-declare_project(thirdparty/curl DEPENDS openssl zlib EXCLUDE_FROM_ALL)
+declare_project(thirdparty/curl DEPENDS libressl zlib EXCLUDE_FROM_ALL)
 
 # czmq
 if(NOT WIN32)
@@ -318,7 +318,7 @@ declare_project(thirdparty/luajson)
 declare_project(thirdparty/luarocks DEPENDS luajit EXCLUDE_FROM_ALL)
 
 # luasec
-declare_project(thirdparty/luasec DEPENDS luajit luasocket openssl)
+declare_project(thirdparty/luasec DEPENDS luajit luasocket libressl)
 
 # luasocket
 declare_project(thirdparty/luasocket DEPENDS luajit)
@@ -354,9 +354,6 @@ else()
 endif()
 declare_project(thirdparty/openssh ${EXCLUDE_FROM_ALL})
 
-# openssl
-declare_project(thirdparty/openssl)
-
 # pcre2
 declare_project(thirdparty/pcre2 EXCLUDE_FROM_ALL)
 
@@ -396,7 +393,7 @@ endif()
 declare_project(thirdparty/tesseract DEPENDS ${DEPENDS})
 
 # turbo
-declare_project(thirdparty/turbo DEPENDS openssl)
+declare_project(thirdparty/turbo DEPENDS libressl)
 
 # utf8proc
 declare_project(thirdparty/utf8proc)
@@ -413,7 +410,7 @@ if(CERVANTES OR KINDLE OR KOBO OR POCKETBOOK OR REMARKABLE OR SONY_PRSTUX)
 else()
     set(EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL)
 endif()
-declare_project(thirdparty/zsync2 DEPENDS curl openssl zlib ${EXCLUDE_FROM_ALL})
+declare_project(thirdparty/zsync2 DEPENDS curl libressl zlib ${EXCLUDE_FROM_ALL})
 
 # }}}
 

diff --git a/ffi/crypto.lua b/ffi/crypto.lua
@@ -7,7 +7,7 @@ LuaJIT FFI wrapper for libcrypto (OpenSSL).
 local ffi = require("ffi")
 require("ffi/crypto_h")
 
-local libcrypto = ffi.loadlib("crypto", "1.1")
+local libcrypto = ffi.loadlib("crypto", "55")
 local crypto = {}
 
 function crypto.pbkdf2_hmac_sha1(pass, salt, iterations, key_len)

diff --git a/thirdparty/cmake_modules/koreader_targets.cmake b/thirdparty/cmake_modules/koreader_targets.cmake
@@ -297,6 +297,8 @@ if(MONOLIBTIC)
         leptonica::leptonica
         libjpeg-turbo::turbojpeg
         libk2pdfopt::k2pdfopt
+        libressl::crypto
+        libressl::ssl
         libzmq::zmq
         lodepng::lodepng
         lpeg::lpeg
@@ -305,8 +307,6 @@ if(MONOLIBTIC)
         luasocket::luasocket
         luasocket::mcore
         luasocket::score
-        openssl::crypto
-        openssl::ssl
         pthread
         sqlite::sqlite3
         turbo::tffi_wrap

diff --git a/thirdparty/cmake_modules/koreader_thirdparty_libs.cmake b/thirdparty/cmake_modules/koreader_thirdparty_libs.cmake
@@ -189,16 +189,6 @@ if(MONOLIBTIC)
     declare_dependency(openlipclua::libopenlipclua SHARED lipc STATIC openlipclua)
 endif()
 
-# openssl
-set(CRYPTO_LIBS)
-set(SSL_LIBS)
-if(MONOLIBTIC)
-    list(APPEND CRYPTO_LIBS dl pthread)
-    list(APPEND SSL_LIBS pthread)
-endif()
-declare_dependency(openssl::crypto MONOLIBTIC crypto LIBRARIES ${CRYPTO_LIBS})
-declare_dependency(openssl::ssl MONOLIBTIC ssl LIBRARIES ${SSL_LIBS})
-
 # nanosvg
 declare_dependency(nanosvg::nanosvg LIBRARIES m)
 

diff --git a/thirdparty/openssl/CMakeLists.txt b/thirdparty/openssl/CMakeLists.txt
diff --git a/thirdparty/openssl/fix_libcrypto_pkg-config_entry.patch b/thirdparty/openssl/fix_libcrypto_pkg-config_entry.patch
diff --git a/thirdparty/openssl/macos_rpath.patch b/thirdparty/openssl/macos_rpath.patch
diff --git a/thirdparty/openssl/openssl-1.1.0j-parallel_install_fix.patch b/thirdparty/openssl/openssl-1.1.0j-parallel_install_fix.patch
diff --git a/thirdparty/openssl/reduce_build_verbosity.patch b/thirdparty/openssl/reduce_build_verbosity.patch