From 462c86f8f897448e45fa8b2e21a25c04d5c7dafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Stro=CC=88mbergson?= <joachim@secworks.se>
Date: Tue, 11 Dec 2018 14:40:28 +0100
Subject: Zeroisation of wrapper key registers. Adding reset of key_loaded
 register.

---
 src/rtl/keywrap.v      | 6 ++++++
 src/rtl/keywrap_core.v | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/rtl/keywrap.v b/src/rtl/keywrap.v
index 02c20fc..36e95bf 100644
--- a/src/rtl/keywrap.v
+++ b/src/rtl/keywrap.v
@@ -270,6 +270,12 @@ module keywrap #(parameter ADDR_BITS = 13)
           if (a1_we)
             a1_reg <= write_data;
 
+          if (zeroise_reg)
+            begin
+              for (i = 0 ; i < 8 ; i = i + 1)
+                key_reg[i] <= 32'h0;
+            end
+
           if (key_we)
             key_reg[address[2 : 0]] <= write_data;
 
diff --git a/src/rtl/keywrap_core.v b/src/rtl/keywrap_core.v
index 41ad531..5d628e2 100644
--- a/src/rtl/keywrap_core.v
+++ b/src/rtl/keywrap_core.v
@@ -626,6 +626,8 @@ module keywrap_core #(parameter MEM_BITS = 11)
             zero_key = 1'h1;
             if (aes_ready)
               begin
+                key_loaded_new        = 1'h0;
+                key_loaded_we         = 1'h1;
                 ready_new             = 1'h1;
                 ready_we              = 1'h1;
                 keywrap_core_ctrl_new = CTRL_IDLE;
-- 
cgit v1.2.3