summaryrefslogtreecommitdiffstats
path: root/src/core/crypto
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-11-14 19:47:23 +0100
committerGitHub <noreply@github.com>2019-11-14 19:47:23 +0100
commit360b0d1b3028a845948d47651bf25492273ce125 (patch)
treead9518767d3c9a820b6a1dc329d2290249321090 /src/core/crypto
parentMerge pull request #3092 from lioncash/util (diff)
parentcore: Migrate off deprecated mbedtls functions (diff)
downloadyuzu-360b0d1b3028a845948d47651bf25492273ce125.tar
yuzu-360b0d1b3028a845948d47651bf25492273ce125.tar.gz
yuzu-360b0d1b3028a845948d47651bf25492273ce125.tar.bz2
yuzu-360b0d1b3028a845948d47651bf25492273ce125.tar.lz
yuzu-360b0d1b3028a845948d47651bf25492273ce125.tar.xz
yuzu-360b0d1b3028a845948d47651bf25492273ce125.tar.zst
yuzu-360b0d1b3028a845948d47651bf25492273ce125.zip
Diffstat (limited to 'src/core/crypto')
-rw-r--r--src/core/crypto/key_manager.cpp2
-rw-r--r--src/core/crypto/partition_data_manager.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp
index 12f13b742..487b57053 100644
--- a/src/core/crypto/key_manager.cpp
+++ b/src/core/crypto/key_manager.cpp
@@ -396,7 +396,7 @@ static std::array<u8, target_size> MGF1(const std::array<u8, in_size>& seed) {
while (out.size() < target_size) {
out.resize(out.size() + 0x20);
seed_exp[in_size + 3] = static_cast<u8>(i);
- mbedtls_sha256(seed_exp.data(), seed_exp.size(), out.data() + out.size() - 0x20, 0);
+ mbedtls_sha256_ret(seed_exp.data(), seed_exp.size(), out.data() + out.size() - 0x20, 0);
++i;
}
diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp
index 594cd82c5..a4b09fd12 100644
--- a/src/core/crypto/partition_data_manager.cpp
+++ b/src/core/crypto/partition_data_manager.cpp
@@ -161,7 +161,7 @@ std::array<u8, key_size> FindKeyFromHex(const std::vector<u8>& binary,
std::array<u8, 0x20> temp{};
for (size_t i = 0; i < binary.size() - key_size; ++i) {
- mbedtls_sha256(binary.data() + i, key_size, temp.data(), 0);
+ mbedtls_sha256_ret(binary.data() + i, key_size, temp.data(), 0);
if (temp != hash)
continue;
@@ -189,7 +189,7 @@ static std::array<Key128, 0x20> FindEncryptedMasterKeyFromHex(const std::vector<
AESCipher<Key128> cipher(key, Mode::ECB);
for (size_t i = 0; i < binary.size() - 0x10; ++i) {
cipher.Transcode(binary.data() + i, dec_temp.size(), dec_temp.data(), Op::Decrypt);
- mbedtls_sha256(dec_temp.data(), dec_temp.size(), temp.data(), 0);
+ mbedtls_sha256_ret(dec_temp.data(), dec_temp.size(), temp.data(), 0);
for (size_t k = 0; k < out.size(); ++k) {
if (temp == master_key_hashes[k]) {