From 0a687b82d49f5b944379ce2522c8f7778150b034 Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 23 Feb 2026 02:50:13 +0100 Subject: [crypto] Atomize all traces of MbedTLS, and require OpenSSL 3+ (#3606) Closes #3137 Closes #3465 - Replace all mbedtls usage with OpenSSL - require OpenSSL - Up OpenSSL version to 3, cuz that's what we actually need... CAVEATS: - httplib also now required - other ssl backends for svc are unused, maybe remove later * To be fair, our CI never used them anyways. And we never tested those TESTERS PLEASE TEST: - All games and applets boot - Boot, load, exit, etc. times Co-authored-by: crueter Signed-off-by: lizzie Co-authored-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3606 Reviewed-by: crueter Reviewed-by: MaranBr Reviewed-by: DraVee Co-authored-by: lizzie Co-committed-by: lizzie --- externals/CMakeLists.txt | 7 +------ externals/cpmfile.json | 17 +++-------------- 2 files changed, 4 insertions(+), 20 deletions(-) (limited to 'externals') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 3b4627d48b..acec7debe5 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -41,9 +41,6 @@ if (NOT TARGET enet::enet) add_library(enet::enet ALIAS enet) endif() -# mbedtls -AddJsonPackage(mbedtls) - # stb add_library(stb stb/stb_dxt.cpp) target_include_directories(stb PUBLIC ./stb) @@ -234,9 +231,7 @@ if (VulkanMemoryAllocator_ADDED) endif() # httplib -if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER OR USE_DISCORD_PRESENCE OR ENABLE_OPENSSL) - AddJsonPackage(httplib) -endif() +AddJsonPackage(httplib) # cpp-jwt if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 37bf5dffb1..9644647638 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -33,6 +33,9 @@ "find_args": "MODULE GLOBAL", "patches": [ "0001-mingw.patch" + ], + "options": [ + "HTTPLIB_REQUIRE_OPENSSL ON" ] }, "cpp-jwt": { @@ -88,20 +91,6 @@ "0001-avoid-memset-when-clearing-an-empty-table.patch" ] }, - "mbedtls": { - "package": "MbedTLS", - "repo": "Mbed-TLS/mbedtls", - "tag": "mbedtls-%VERSION%", - "hash": "6671fb8fcaa832e5b115dfdce8f78baa6a4aea71f5c89a640583634cdee27aefe3bf4be075744da91f7c3ae5ea4e0c765c8fc3937b5cfd9ea73d87ef496524da", - "version": "3", - "git_version": "3.6.4", - "artifact": "%TAG%.tar.bz2", - "skip_updates": true, - "patches": [ - "0001-aesni-fix.patch", - "0002-arm64-aes-fix.patch" - ] - }, "enet": { "repo": "lsalzman/enet", "tag": "v%VERSION%", -- cgit v1.2.3