Refactor nxboot package2 reading, work around sdmmc issue, other changes

2018-05-17 23:18:33 +02:00
parent 9ed2f92cdc
commit ec6d05892c
5 changed files with 52 additions and 47 deletions
--- a/fusee/fusee-secondary/src/key_derivation.c
+++ b/fusee/fusee-secondary/src/key_derivation.c
@@ -155,8 +155,7 @@ int derive_nx_keydata(uint32_t target_firmware, const nx_keyblob_t *keyblobs, ui
    }

    /* Setup master key revision, derive older master keys for use. */
-    mkey_detect_revision();
-    return 0;
+    return mkey_detect_revision();
 }

 /* Sets final keyslot flags, for handover to TZ/Exosphere. Setting these will prevent the BPMP from using the device key or master key. */