2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp
index da15f764a..1f0d3170b 100644
--- a/src/core/crypto/key_manager.cpp
+++ b/src/core/crypto/key_manager.cpp
@@ -143,6 +143,7 @@ u64 GetSignatureTypeDataSize(SignatureType type) {
         return 0x3C;
     }
     UNREACHABLE();
+    return 0;
 }
 
 u64 GetSignatureTypePaddingSize(SignatureType type) {
@@ -157,6 +158,7 @@ u64 GetSignatureTypePaddingSize(SignatureType type) {
         return 0x40;
     }
     UNREACHABLE();
+    return 0;
 }
 
 SignatureType Ticket::GetSignatureType() const {
@@ -171,6 +173,7 @@ SignatureType Ticket::GetSignatureType() const {
     }
 
     UNREACHABLE();
+    return {};
 }
 
 TicketData& Ticket::GetData() {
@@ -348,7 +351,7 @@ std::optional<Key128> DeriveSDSeed() {
     std::array<u8, 0x10> buffer{};
     std::size_t offset = 0;
     for (; offset + 0x10 < save_43.GetSize(); ++offset) {
-        if (!save_43.Seek(offset, SEEK_SET)) {
+        if (!save_43.Seek(static_cast<s64>(offset), SEEK_SET)) {
             return std::nullopt;
         }
 
@@ -358,7 +361,7 @@ std::optional<Key128> DeriveSDSeed() {
         }
     }
 
-    if (!save_43.Seek(offset + 0x10, SEEK_SET)) {
+    if (!save_43.Seek(static_cast<s64>(offset + 0x10), SEEK_SET)) {
         return std::nullopt;
     }
 
diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp
index 5f1c86a09..db54f71f4 100644
--- a/src/core/crypto/partition_data_manager.cpp
+++ b/src/core/crypto/partition_data_manager.cpp
@@ -161,7 +161,7 @@ static constexpr u8 CalculateMaxKeyblobSourceHash() {
         return true;
     };
 
-    for (s8 i = 0x1F; i >= 0; --i) {
+    for (std::size_t i = 0x1F; i <= 0x1F; --i) {
         if (!is_zero(keyblob_source_hashes[i])) {
             return static_cast<u8>(i + 1);
         }