summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-03-06 00:48:28 +0100
committerGitHub <noreply@github.com>2021-03-06 00:48:28 +0100
commit9d010be4837cc88e28c700f640c1c101092d482a (patch)
tree5dd4ec29153cc8a9a8f932114ac24bfa9f1289ea
parentMerge pull request #6006 from bunnei/fiber-unique-ptr (diff)
parentaes_util: Remove malformed mbedtls_cipher_finish function call (diff)
downloadyuzu-9d010be4837cc88e28c700f640c1c101092d482a.tar
yuzu-9d010be4837cc88e28c700f640c1c101092d482a.tar.gz
yuzu-9d010be4837cc88e28c700f640c1c101092d482a.tar.bz2
yuzu-9d010be4837cc88e28c700f640c1c101092d482a.tar.lz
yuzu-9d010be4837cc88e28c700f640c1c101092d482a.tar.xz
yuzu-9d010be4837cc88e28c700f640c1c101092d482a.tar.zst
yuzu-9d010be4837cc88e28c700f640c1c101092d482a.zip
-rw-r--r--.gitmodules2
m---------externals/mbedtls0
-rw-r--r--src/core/crypto/aes_util.cpp2
3 files changed, 1 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index 93ba9b930..a0a89933d 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
-Subproject a280e602f3a4ae001d3a83cbc3e6e04c99c2227
+Subproject eac2416b8fdb2cb9c867a538100bf95326bad75
diff --git a/src/core/crypto/aes_util.cpp b/src/core/crypto/aes_util.cpp
index 6a9734812..cb7506241 100644
--- a/src/core/crypto/aes_util.cpp
+++ b/src/core/crypto/aes_util.cpp
@@ -105,8 +105,6 @@ void AESCipher<Key, KeySize>::Transcode(const u8* src, std::size_t size, u8* des
}
}
}
-
- mbedtls_cipher_finish(context, nullptr, nullptr);
}
template <typename Key, std::size_t KeySize>