summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-04-21 20:11:18 +0200
committerGitHub <noreply@github.com>2020-04-21 20:11:18 +0200
commit9bf3abcb63003e1f6cb911270a88cda761f63525 (patch)
treec633d54ee61e75888ce227720d576b7c0d3cf7e5 /src/core
parentMerge pull request #3724 from bunnei/fix-unicorn (diff)
parentkey_manager: Resolve missing field initializer warning (diff)
downloadyuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar
yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar.gz
yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar.bz2
yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar.lz
yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar.xz
yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar.zst
yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/crypto/key_manager.cpp3
-rw-r--r--src/core/hle/service/time/time_zone_manager.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp
index 87e6a1fd3..8997c7082 100644
--- a/src/core/crypto/key_manager.cpp
+++ b/src/core/crypto/key_manager.cpp
@@ -1202,7 +1202,8 @@ const boost::container::flat_map<std::string, KeyIndex<S128KeyType>> KeyManager:
{S128KeyType::Source, static_cast<u64>(SourceKeyType::KeyAreaKey),
static_cast<u64>(KeyAreaKeyType::System)}},
{"titlekek_source", {S128KeyType::Source, static_cast<u64>(SourceKeyType::Titlekek), 0}},
- {"keyblob_mac_key_source", {S128KeyType::Source, static_cast<u64>(SourceKeyType::KeyblobMAC)}},
+ {"keyblob_mac_key_source",
+ {S128KeyType::Source, static_cast<u64>(SourceKeyType::KeyblobMAC), 0}},
{"tsec_key", {S128KeyType::TSEC, 0, 0}},
{"secure_boot_key", {S128KeyType::SecureBoot, 0, 0}},
{"sd_seed", {S128KeyType::SDSeed, 0, 0}},
diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp
index c8159bcd5..69152d0ac 100644
--- a/src/core/hle/service/time/time_zone_manager.cpp
+++ b/src/core/hle/service/time/time_zone_manager.cpp
@@ -518,8 +518,8 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
constexpr s32 time_zone_max_leaps{50};
constexpr s32 time_zone_max_chars{50};
if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps &&
- 0 < header.type_count && header.type_count < time_zone_rule.ttis.size() &&
- 0 <= header.time_count && header.time_count < time_zone_rule.ats.size() &&
+ 0 < header.type_count && header.type_count < s32(time_zone_rule.ttis.size()) &&
+ 0 <= header.time_count && header.time_count < s32(time_zone_rule.ats.size()) &&
0 <= header.char_count && header.char_count < time_zone_max_chars &&
(header.ttis_std_count == header.type_count || header.ttis_std_count == 0) &&
(header.ttis_gmt_count == header.type_count || header.ttis_gmt_count == 0))) {