From 52921d6ee342ccb74af9cf87a616b6d521c12ca8 Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Sun, 22 Feb 2026 17:36:39 -0500
Subject: [PATCH] Truly delete MbedTLS

Signed-off-by: crueter <crueter@eden-emu.dev>
---
 CMakeLists.txt                    | 13 ++-----------
 externals/CMakeLists.txt          |  3 ---
 externals/cpmfile.json            | 14 --------------
 src/core/CMakeLists.txt           |  4 +---
 src/dedicated_room/CMakeLists.txt |  2 --
 5 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d75e14e42..dc46cdf817 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,10 +58,9 @@ if (YUZU_STATIC_ROOM)
     set(ENABLE_WEB_SERVICE OFF)
     set(ENABLE_LIBUSB OFF)
 
-    # allow static libs for boost and mbedtls though
+    # allow static libs for boost though
     set(Boost_USE_STATIC_LIBS ON)
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-    set(MBEDTLS_LIB_SUFFIX "_static")
     set(OPENSSL_USE_STATIC_LIBS ON)
     set(YUZU_USE_CPM ON)
 
@@ -69,10 +68,6 @@ if (YUZU_STATIC_ROOM)
     set(fmt_FORCE_BUNDLED ON)
 endif()
 
-# common network mbedtls
-# common: xbyak? booost fmt lz4 zstd
-# network: enet boost
-
 # qt stuff
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
@@ -130,9 +125,6 @@ if (YUZU_STATIC_BUILD)
         set(YUZU_USE_BUNDLED_OPENSSL ON)
 
         set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
-
-        ## some libraries define a Library::Name_static alternative ##
-        set(MBEDTLS_LIB_SUFFIX _static)
     elseif(APPLE)
         set(YUZU_USE_CPM ON)
 
@@ -145,7 +137,6 @@ if (YUZU_STATIC_BUILD)
         set(SPIRV-Tools_FORCE_BUNDLED ON)
         set(SPIRV-Headers_FORCE_BUNDLED ON)
         set(zstd_FORCE_BUNDLED ON)
-        set(MbedTLS_FORCE_BUNDLED ON)
     endif()
 endif()
 
@@ -550,8 +541,8 @@ message(STATUS "Platform Libraries: ${PLATFORM_LIBRARIES}")
 add_subdirectory(externals)
 
 # pass targets from externals
+# TODO(crueter): CPMUtil Propagate func?
 find_package(enet)
-find_package(MbedTLS)
 find_package(unordered_dense REQUIRED)
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 527d7de363..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)
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index 37bf5dffb1..8344634ccb 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -88,20 +88,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%",
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 0ff1b985d0..b3071d94b2 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1219,9 +1219,7 @@ target_link_libraries(core PRIVATE
     fmt::fmt
     nlohmann_json::nlohmann_json
     RenderDoc::API
-    ZLIB::ZLIB
-    MbedTLS::mbedcrypto${MBEDTLS_LIB_SUFFIX}
-    MbedTLS::mbedtls${MBEDTLS_LIB_SUFFIX})
+    ZLIB::ZLIB)
 
 target_link_libraries(core PRIVATE httplib::httplib)
 
diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt
index 877429e344..36c8af5e34 100644
--- a/src/dedicated_room/CMakeLists.txt
+++ b/src/dedicated_room/CMakeLists.txt
@@ -17,8 +17,6 @@ if (ENABLE_WEB_SERVICE)
 endif()
 
 target_link_libraries(yuzu-room PRIVATE
-    MbedTLS::mbedcrypto${MBEDTLS_LIB_SUFFIX}
-    MbedTLS::mbedtls${MBEDTLS_LIB_SUFFIX}
     OpenSSL::SSL
     OpenSSL::Crypto)