Bläddra i källkod

Merge pull request #4494 from lioncash/transcode

aes_util: Make use of non-template variant of Transcode
bunnei 6 år sedan
förälder
incheckning
0530dd6ea1
2 ändrade filer med 3 tillägg och 3 borttagningar
  1. 1 1
      src/core/crypto/aes_util.cpp
  2. 2 2
      src/core/crypto/partition_data_manager.cpp

+ 1 - 1
src/core/crypto/aes_util.cpp

@@ -116,7 +116,7 @@ void AESCipher<Key, KeySize>::XTSTranscode(const u8* src, std::size_t size, u8*
 
     for (std::size_t i = 0; i < size; i += sector_size) {
         SetIV(CalculateNintendoTweak(sector_id++));
-        Transcode<u8, u8>(src + i, sector_size, dest + i, op);
+        Transcode(src + i, sector_size, dest + i, op);
     }
 }
 

+ 2 - 2
src/core/crypto/partition_data_manager.cpp

@@ -367,8 +367,8 @@ static bool AttemptDecrypt(const std::array<u8, 16>& key, Package2Header& header
     Package2Header temp = header;
     AESCipher<Key128> cipher(key, Mode::CTR);
     cipher.SetIV(header.header_ctr);
-    cipher.Transcode(&temp.header_ctr, sizeof(Package2Header) - 0x100, &temp.header_ctr,
-                     Op::Decrypt);
+    cipher.Transcode(&temp.header_ctr, sizeof(Package2Header) - sizeof(Package2Header::signature),
+                     &temp.header_ctr, Op::Decrypt);
     if (temp.magic == Common::MakeMagic('P', 'K', '2', '1')) {
         header = temp;
         return true;