[Cryptech-Commits] [core/cipher/aes] 20/21: Adding restriction to the API to only allow writes to controlling registers. This fixes CT-01-002 FPGA.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository core/cipher/aes.

commit 833921d5f0f2c7a62594b134e6d756abd5ec012e
Author: Joachim Strömbergson <joachim at secworks.se>
AuthorDate: Wed Oct 3 09:15:14 2018 +0200

    Adding restriction to the API to only allow writes to controlling registers. This fixes CT-01-002 FPGA.
---
 src/rtl/aes.v | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/rtl/aes.v b/src/rtl/aes.v
index 48a7735..492ba56 100644
--- a/src/rtl/aes.v
+++ b/src/rtl/aes.v
@@ -225,20 +225,23 @@ module aes(
         begin
           if (we)
             begin
-              if (address == ADDR_CTRL)
+              if (core_ready)
                 begin
-                  init_new = write_data[CTRL_INIT_BIT];
-                  next_new = write_data[CTRL_NEXT_BIT];
-                end
+                  if (address == ADDR_CTRL)
+                      begin
+                        init_new = write_data[CTRL_INIT_BIT];
+                        next_new = write_data[CTRL_NEXT_BIT];
+                      end
 
-              if (address == ADDR_CONFIG)
-                config_we = 1'b1;
+                  if (address == ADDR_CONFIG)
+                    config_we = 1'b1;
 
-              if ((address >= ADDR_KEY0) && (address <= ADDR_KEY7))
-                key_we = 1'b1;
+                  if ((address >= ADDR_KEY0) && (address <= ADDR_KEY7))
+                    key_we = 1'b1;
 
-              if ((address >= ADDR_BLOCK0) && (address <= ADDR_BLOCK3))
-                block_we = 1'b1;
+                  if ((address >= ADDR_BLOCK0) && (address <= ADDR_BLOCK3))
+                    block_we = 1'b1;
+                end
             end // if (we)
 
           else