[aes] Rename `NumDelayCyclesStartTrigger` parameter
This commit renames the security-critical parameter
`NumDelayCyclesStartTrigger` to `SecStartTriggerDelay`. The `Sec`
prefix indicates that this parameter is security critical. This
can be leveraged by tools like reggen and topgen.
Signed-off-by: Pirmin Vogel <vogelpi@lowrisc.org>
diff --git a/hw/ip/aes/rtl/aes.sv b/hw/ip/aes/rtl/aes.sv
index 5e89d0a..6c35c3b 100644
--- a/hw/ip/aes/rtl/aes.sv
+++ b/hw/ip/aes/rtl/aes.sv
@@ -10,19 +10,19 @@
import aes_pkg::*;
import aes_reg_pkg::*;
#(
- parameter bit AES192Enable = 1, // Can be 0 (disable), or 1 (enable).
- parameter bit Masking = 0, // Can be 0 (no masking), or
- // 1 (first-order masking) of the cipher
- // core. Masking requires the use of a
- // masked S-Box, see SBoxImpl parameter.
- // Note: currently, constant masks are
- // used, this is of course not secure.
- parameter sbox_impl_e SBoxImpl = SBoxImplLut, // See aes_pkg.sv
- parameter int unsigned NumDelayCyclesStartTrigger = 0, // Manual start trigger delay, useful for
- // SCA measurements. A value of e.g. 40
- // allows the processor to go into sleep
- // before AES starts operation.
- parameter logic [NumAlerts-1:0] AlertAsyncOn = {NumAlerts{1'b1}}
+ parameter bit AES192Enable = 1, // Can be 0 (disable), or 1 (enable).
+ parameter bit Masking = 0, // Can be 0 (no masking), or
+ // 1 (first-order masking) of the cipher
+ // core. Masking requires the use of a
+ // masked S-Box, see SBoxImpl parameter.
+ // Note: currently, constant masks are
+ // used, this is of course not secure.
+ parameter sbox_impl_e SBoxImpl = SBoxImplLut, // See aes_pkg.sv
+ parameter int unsigned SecStartTriggerDelay = 0, // Manual start trigger delay, useful for
+ // SCA measurements. A value of e.g. 40
+ // allows the processor to go into sleep
+ // before AES starts operation.
+ parameter logic [NumAlerts-1:0] AlertAsyncOn = {NumAlerts{1'b1}}
) (
input clk_i,
input rst_ni,
@@ -68,10 +68,10 @@
);
aes_core #(
- .AES192Enable ( AES192Enable ),
- .Masking ( Masking ),
- .SBoxImpl ( SBoxImpl ),
- .NumDelayCyclesStartTrigger ( NumDelayCyclesStartTrigger )
+ .AES192Enable ( AES192Enable ),
+ .Masking ( Masking ),
+ .SBoxImpl ( SBoxImpl ),
+ .SecStartTriggerDelay ( SecStartTriggerDelay )
) u_aes_core (
.clk_i,
.rst_ni,
diff --git a/hw/ip/aes/rtl/aes_control.sv b/hw/ip/aes/rtl/aes_control.sv
index 42b5df0..a8d256f 100644
--- a/hw/ip/aes/rtl/aes_control.sv
+++ b/hw/ip/aes/rtl/aes_control.sv
@@ -10,7 +10,7 @@
module aes_control
#(
- parameter int unsigned NumDelayCyclesStartTrigger = 0
+ parameter int unsigned SecStartTriggerDelay = 0
) (
input logic clk_i,
input logic rst_ni,
@@ -147,15 +147,15 @@
logic ctrl_we_q;
logic clear_in_out_status;
- if (NumDelayCyclesStartTrigger > 0) begin : gen_start_delay
+ if (SecStartTriggerDelay > 0) begin : gen_start_delay
// Delay the manual start trigger input for SCA measurements.
- localparam int unsigned WidthCounter = $clog2(NumDelayCyclesStartTrigger+1);
+ localparam int unsigned WidthCounter = $clog2(SecStartTriggerDelay+1);
logic [WidthCounter-1:0] count_d, count_q;
// Clear counter when input goes low. Keep value if the specified delay is reached.
assign count_d = !start_i ? '0 :
start_trigger ? count_q : count_q + 1'b1;
- assign start_trigger = (count_q == NumDelayCyclesStartTrigger[WidthCounter-1:0]) ? 1'b1 : 1'b0;
+ assign start_trigger = (count_q == SecStartTriggerDelay[WidthCounter-1:0]) ? 1'b1 : 1'b0;
always_ff @(posedge clk_i or negedge rst_ni) begin
if (!rst_ni) begin
diff --git a/hw/ip/aes/rtl/aes_core.sv b/hw/ip/aes/rtl/aes_core.sv
index 41120f4..590f311 100644
--- a/hw/ip/aes/rtl/aes_core.sv
+++ b/hw/ip/aes/rtl/aes_core.sv
@@ -8,12 +8,12 @@
module aes_core import aes_pkg::*;
#(
- parameter bit AES192Enable = 1,
- parameter bit Masking = 0,
- parameter sbox_impl_e SBoxImpl = SBoxImplLut,
- parameter int unsigned NumDelayCyclesStartTrigger = 0,
+ parameter bit AES192Enable = 1,
+ parameter bit Masking = 0,
+ parameter sbox_impl_e SBoxImpl = SBoxImplLut,
+ parameter int unsigned SecStartTriggerDelay = 0,
- localparam int NumShares = Masking ? 2 : 1 // derived parameter
+ localparam int NumShares = Masking ? 2 : 1 // derived parameter
) (
input logic clk_i,
input logic rst_ni,
@@ -409,7 +409,7 @@
// Control
aes_control #(
- .NumDelayCyclesStartTrigger ( NumDelayCyclesStartTrigger )
+ .SecStartTriggerDelay ( SecStartTriggerDelay )
) u_aes_control (
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
