From ca7b441079c59f802dbe94c83130679dd051b0e4 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Fri, 2 Mar 2018 12:59:12 -0800
Subject: [PATCH] Add call to se_generate_stored_vector() before validating

---
 exosphere/src/bootup.c   | 3 +--
 exosphere/src/package2.c | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/exosphere/src/bootup.c b/exosphere/src/bootup.c
index 291c1741a..098d92abb 100644
--- a/exosphere/src/bootup.c
+++ b/exosphere/src/bootup.c
@@ -16,13 +16,12 @@
 void bootup_misc_mmio(void) {
     /* Initialize Fuse registers. */
     fuse_init();
-    
+
     /* Verify Security Engine sanity. */
     se_set_in_context_save_mode(false);
     /* TODO: se_verify_keys_unreadable(); */
     se_validate_stored_vector();
 
-
     for (unsigned int i = 0; i < KEYSLOT_SWITCH_SESSIONKEY; i++) {
         clear_aes_keyslot(i);
     }
diff --git a/exosphere/src/package2.c b/exosphere/src/package2.c
index 3b87f832e..85c1f5993 100644
--- a/exosphere/src/package2.c
+++ b/exosphere/src/package2.c
@@ -74,7 +74,8 @@ static void setup_se(void) {
     decrypt_data_into_keyslot(KEYSLOT_SWITCH_SESSIONKEY, KEYSLOT_SWITCH_DEVICEKEY, work_buffer, 0x10);
     set_aes_keyslot_flags(KEYSLOT_SWITCH_SESSIONKEY, 0xFF);
 
-    /* TODO: Create Test Vector, to validate keyslot data is unchanged post warmboot. */
+    /* Generate test vector for our keys. */
+    se_generate_stored_vector();
 }
 
 static void setup_boot_config(void) {
@@ -452,6 +453,6 @@ void load_package2(coldboot_crt0_reloc_list_t *reloc_list) {
     /* TODO: Update SCR_EL3 depending on value in Bootconfig. */
 
     if (MAILBOX_NX_BOOTLOADER_IS_SECMON_AWAKE) {
-        panic(0xFFF00001);
+        panic(0x7A700001);
     }
 }