From 9cc33ebee3a90767925c529026aa14943b1bdf5f Mon Sep 17 00:00:00 2001
From: Kookies <66989235+KookiesGH@users.noreply.github.com>
Date: Mon, 25 Oct 2021 21:41:18 -0600
Subject: [PATCH] Method 1 overhaul to reflect the new key derivation methods
 in Citra. Also a fair bit of grammar correction and layout changes.

---
 AES-Keys.md | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/AES-Keys.md b/AES-Keys.md
index 1331d52..c374b36 100644
--- a/AES-Keys.md
+++ b/AES-Keys.md
@@ -1,28 +1,40 @@
+# How to obtain AES Keys
+
 Users can provide some additional crypto keys to enable some advanced features in Citra. These keys are not officially provided by Citra due to legal considerations.
-# Instructions to obtain AES Keys
 
 ### Method 1
-In this method, you will need to dump your bootrom, native_firm & secret section(for n3ds) from your console.
+In this method, you will dump the ARM9 BootROM, `NATIVE_FIRM`, and `SAFE_MODE_FIRM` (and the secret section for "New" models) from your console using GodMode9.
 
-**Note:** You will still need to provide the `0x25 KeyX` using Method 2.
+**Note:** If you only have access to a "New" model console, you will still need to provide `0x25KeyX` using Method 2.
 
-**Step 1** - bootrom
+**Step 1** - ARM9 BootROM
 
-The bootrom boot9.bin can be dumped with Godmode9:
+* After launching GodMode9, enter the `[M:] MEMORY VIRTUAL` drive.
+* Navigate to `boot9.bin`; press `A`.
+* Select `Copy to 0:/gm9/out`. `boot9.bin` will be dumped to `gm9/out` on your SD card.
+* Power off the console by pressing `HOME`, and then `Poweroff system`. 
+* Eject the SD card from your console and insert it into your computer/device. Copy/move `boot9.bin` from `gm9/out` on the SD card to the `sysdata` folder in the [[User Directory]].
 
-* Go to drive `M: Memory Virtual`
-* Navigate to `boot9.bin`, press A
-* Select `Copy to O:/gm9out`. This will give you boot9.bin in gm9out on your SD card
-* The `boot9.bin` needs to be placed in the `sysdata` folder in the [[User Directory]].
+**Step 2** - `NATIVE_FIRM`, `SAFE_MODE_FIRM`, and the secret section.
 
-**Step 2** - native_firm & secret section
-
-**For o3DS / o2DS**
-* In GodMode9, navigate to `sysnand ctrnand` -> `title` -> and then dump `00040138/00000003` as cia and install it in Citra.
+**For "Old" models**
+1. Reinsert the SD card into the console and launch GodMode9
+2. Press `HOME`, select `Title manager`, and then select `[1:] NAND / TWL` as a source.
+3. After the title scan is complete, navigate to the titles named `0004013800000002 (CTR-P-CTAP)` and `0004013800000003 (CTR-P-CTAP)`.
+4. Open `0004013800000002 (CTR-P-CTAP)`, select `Manage Title...`, and then select `Build CIA (standard)`.
+5. Repeat the process above with `0004013800000003 (CTR-P-CTAP)`
+6. Power off the system by pressing `HOME`, and then `Poweroff system`.
+7. Eject the SD card from your console and insert it into your computer/device. Copy/move both CIA files from `gm9/out` on the SD card to a location of your choosing, and install both to Citra's NAND (`File` > `Install CIA...`).
  
-**For n3DS/n2DS**
-* In GodMode9, navigate to `sysnand ctrnand` -> `title` -> and then dump `00040138/20000003` as cia and install it in Citra.
-* Dump the secret section with godmode9 and copy the file (sector0x96.bin) to sysdata in the user folder.
+**For "New" models**
+1. Reinsert the SD card into the console and launch GodMode9
+2. Press `HOME`, select `Title manager`, and then select `[1:] NAND / TWL` as a source.
+3. After the title scan is complete, navigate to the title named `0004013820000003 (CTR-P-CTAP)`.
+4. Open `0004013820000003 (CTR-P-CTAP)`, select `Manage Title...`, and then select `Build CIA (standard)`.
+6. Exit the Title manager by pressing `B`, then enter the `[S:] SYSNAND VIRTUAL` drive. Open `sector0x96.bin` (the secret section), and select `Copy to 0:/gm9/out`.
+7. Power off the system by pressing `HOME`, and then `Poweroff system`.
+8. Eject the SD card from your console and insert it into your computer/device. Copy/move the CIA file from `gm9/out` on the SD card to a location of your choosing, and install it to Citra's NAND (`File` > `Install CIA...`). 
+9. Copy/move `sector0x96.bin` from `gm9/out` on the SD card to the `sysdata` folder in the [[User Directory]]. 
 
 ### Method 2
 As an alternative, instead of dumping the required files, you can provide all the AES keys manually. The keys are supplied by filling the file `sysdata/aes_keys.txt` (located in the [[User Directory]]) in the following format: