Today's news:

Developer forgets to swap dest and source when adapting to another API

diff --git a/host/copy.sh b/host/copy.sh
index b124f6e78a9bf6c69302741e04ebdd5ffa2542d7..7033210dcb52a799806d979811db2cd84e860268 100755 (executable)
--- a/host/copy.sh
+++ b/host/copy.sh
@@ -12,6 +12,7 @@ mount -t vfat ${dev}1 $mnt || exit 0
 rm -rf $mnt/corbenik
 cp -r out/* $mnt/ || exit 0
 ( cd $mnt/ && ./n3ds_firm.sh )
+mv $mnt/arm9loaderhax{,_si}.bin
 umount $mnt || exit 0
 sync || exit 0
 eject ${dev} || exit 0

diff --git a/source/firm/firm.c b/source/firm/firm.c
index 6ae3dfc692c7fc3cedba59a4bdbfda8a6758fe3e..e5231e9b65cfb8dd07c44e09c5aea1f5e18d61cf 100644 (file)
--- a/source/firm/firm.c
+++ b/source/firm/firm.c
@@ -272,7 +272,7 @@ decrypt_arm9bin(arm9bin_h *header, uint64_t firm_title, uint8_t version)
         slot = 0x16;
 
         use_aeskey(0x11);
-        aes_decrypt(decrypted_keyx, header->slot0x16keyX, 1, AES_CNT_ECB_DECRYPT_MODE);
+        ecb_decrypt(header->slot0x16keyX, decrypted_keyx, 1, AES_CNT_ECB_DECRYPT_MODE);
         setup_aeskeyX(slot, decrypted_keyx);
     }
 
@@ -366,6 +366,7 @@ load_firm(firm_h *dest, char *path, char *path_firmkey, char *path_cetk, uint32_
                 if (arm9bin_iscrypt) {
                     // Decrypt the arm9bin.
                     if (decrypt_arm9bin((arm9bin_h *)((uintptr_t)dest + section->offset), firm_title, fsig->version)) {
+                        fprintf(stderr, "  ARM9 segment is encrypted\n");
                         return 1;
                     }
                     firmware_changed = 1; // Decryption of arm9bin performed.
@@ -445,7 +446,7 @@ boot_firm()
         use_aeskey(0x11);
         uint8_t keyx[AES_BLOCK_SIZE];
         for (int slot = 0x19; slot < 0x20; slot++) {
-            ecb_decrypt(keyx, keydata, 1, AES_CNT_ECB_DECRYPT_MODE);
+            ecb_decrypt(keydata, keyx, 1, AES_CNT_ECB_DECRYPT_MODE);
             setup_aeskeyX(slot, keyx);
             *(uint8_t *)(keydata + 0xF) += 1;
         }