From 6faabd6d691c2b43c7bd3ca97bf7f49410a3e4f4 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Fri, 5 Mar 2021 00:35:30 -0500 Subject: [PATCH 1/2] externals: Update mbedtls to 2.16.9 mbedtls 2.16 is the last version which has licensing for GPL 2.0. This updates mbedtls to our own fork of mbedtls 2.16 --- .gitmodules | 2 +- externals/mbedtls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 93ba9b930d..a0a89933df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,7 +27,7 @@ url = https://github.com/ReinUsesLisp/sirit [submodule "mbedtls"] path = externals/mbedtls - url = https://github.com/DarkLordZach/mbedtls + url = https://github.com/yuzu-emu/mbedtls [submodule "libzip"] path = externals/libzip/libzip url = https://github.com/nih-at/libzip.git diff --git a/externals/mbedtls b/externals/mbedtls index a280e602f3..eac2416b8f 160000 --- a/externals/mbedtls +++ b/externals/mbedtls @@ -1 +1 @@ -Subproject commit a280e602f3a4ae001d3a83cbc3e6e04c99c22277 +Subproject commit eac2416b8fdb2cb9c867a538100bf95326bad75b From 96c9e67b1b87341e5c70a406ae4bc010f7bd84e0 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Fri, 5 Mar 2021 01:25:30 -0500 Subject: [PATCH 2/2] aes_util: Remove malformed mbedtls_cipher_finish function call --- src/core/crypto/aes_util.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/crypto/aes_util.cpp b/src/core/crypto/aes_util.cpp index 6a97348122..cb7506241b 100644 --- a/src/core/crypto/aes_util.cpp +++ b/src/core/crypto/aes_util.cpp @@ -105,8 +105,6 @@ void AESCipher::Transcode(const u8* src, std::size_t size, u8* des } } } - - mbedtls_cipher_finish(context, nullptr, nullptr); } template