[aes,dv] Set min AAD block length to 0

As providing no AAD block in AES-GCM mode is also possible, test this by adapting the corresponding test configs and setting aad_len_min = 0. Signed-off-by: Pascal Nasahl <[email protected]>
vogelpi · Feb 17, 2025 · 0ff535e · 0ff535e
1 parent a5b70f9
commit 0ff535e
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/hw/ip/aes/dv/tests/aes_alert_reset_test.sv b/hw/ip/aes/dv/tests/aes_alert_reset_test.sv
@@ -29,7 +29,7 @@ class aes_alert_reset_test extends aes_base_test;
 
     cfg.message_len_min          = 7;    // one block (16bytes=128bits)
     cfg.message_len_max          = 300;
-    cfg.aad_len_min              = 7;    // one block (16bytes=128bits)
+    cfg.aad_len_min              = 0;
     cfg.aad_len_max              = 300;
     cfg.manual_operation_pct     = 0;
     cfg.use_key_mask             = 0;

diff --git a/hw/ip/aes/dv/tests/aes_b2b_test.sv b/hw/ip/aes/dv/tests/aes_b2b_test.sv
@@ -31,7 +31,7 @@ class aes_b2b_test extends aes_base_test;
     cfg.message_len_min          = 7;    // bytes
     cfg.message_len_max          = 1023; // bytes
 
-    cfg.aad_len_min              = 7;    // bytes
+    cfg.aad_len_min              = 0;    // bytes
     cfg.aad_len_max              = 1023; // bytes
 
     cfg.fixed_data_en            = 0;

diff --git a/hw/ip/aes/dv/tests/aes_base_test.sv b/hw/ip/aes/dv/tests/aes_base_test.sv
@@ -35,6 +35,8 @@ class aes_base_test extends cip_base_test #(
     cfg.num_messages_max            = 31;
     cfg.message_len_min             = 1;
     cfg.message_len_max             = 599;
+    cfg.aad_len_min                 = 0;
+    cfg.aad_len_max                 = 599;
     cfg.use_key_mask                = 0;
     cfg.use_c_model_pct             = 0;
     cfg.error_types                 = '0;

diff --git a/hw/ip/aes/dv/tests/aes_clear_test.sv b/hw/ip/aes/dv/tests/aes_clear_test.sv
@@ -29,7 +29,7 @@ class aes_clear_test extends aes_base_test;
 
     cfg.message_len_min          = 17;
     cfg.message_len_max          = 317;
-    cfg.aad_len_min              = 17;
+    cfg.aad_len_min              = 0;
     cfg.aad_len_max              = 317;
     cfg.manual_operation_pct     = 30;
     cfg.use_key_mask             = 0;

diff --git a/hw/ip/aes/dv/tests/aes_config_error_test.sv b/hw/ip/aes/dv/tests/aes_config_error_test.sv
@@ -34,7 +34,7 @@ class aes_config_error_test extends aes_base_test;
 
     cfg.message_len_min          = 16;    // one block (16bytes=128bits)
     cfg.message_len_max          = 32;    //
-    cfg.aad_len_min              = 16;    // one block (16bytes=128bits)
+    cfg.aad_len_min              = 0;     //
     cfg.aad_len_max              = 32;    //
     cfg.manual_operation_pct     = 5;
     cfg.use_key_mask             = 0;

diff --git a/hw/ip/aes/dv/tests/aes_deinit_test.sv b/hw/ip/aes/dv/tests/aes_deinit_test.sv
@@ -32,8 +32,8 @@ class aes_deinit_test extends aes_base_test;
     cfg.message_len_max          = 128;  //
     cfg.manual_operation_pct     = 0;
 
-    cfg.aad_len_min              = 16;   // one block (16bytes=128bits)
-    cfg.aad_len_max              = 128;  //
+    cfg.aad_len_min              = 0;
+    cfg.aad_len_max              = 128;
 
     cfg.fixed_data_en            = 0;
     cfg.fixed_key_en             = 0;

diff --git a/hw/ip/aes/dv/tests/aes_fi_test.sv b/hw/ip/aes/dv/tests/aes_fi_test.sv
@@ -30,7 +30,7 @@ class aes_fi_test extends aes_base_test;
 
     cfg.message_len_min          = 1;    // one block (16bytes=128bits)
     cfg.message_len_max          = 65;
-    cfg.aad_len_min              = 1;    // one block (16bytes=128bits)
+    cfg.aad_len_min              = 0;
     cfg.aad_len_max              = 65;
     cfg.manual_operation_pct     = 0;
     cfg.use_key_mask             = 0;

diff --git a/hw/ip/aes/dv/tests/aes_manual_config_err_test.sv b/hw/ip/aes/dv/tests/aes_manual_config_err_test.sv
@@ -37,7 +37,7 @@ class aes_manual_config_err_test extends aes_base_test;
 
     cfg.message_len_min          = 16;
     cfg.message_len_max          = 128;
-    cfg.aad_len_min              = 16;
+    cfg.aad_len_min              = 0;
     cfg.aad_len_max              = 128;
     cfg.manual_operation_pct     = 0;
 

diff --git a/hw/ip/aes/dv/tests/aes_reseed_test.sv b/hw/ip/aes/dv/tests/aes_reseed_test.sv
@@ -29,8 +29,7 @@ class aes_reseed_test extends aes_base_test;
 
     cfg.message_len_min          = 7;    // bytes
     cfg.message_len_max          = 1023; // bytes
-
-    cfg.aad_len_min              = 7;    // bytes
+    cfg.aad_len_min              = 0;    //
     cfg.aad_len_max              = 1023; // bytes
 
     cfg.fixed_data_en            = 0;

diff --git a/hw/ip/aes/dv/tests/aes_sideload_test.sv b/hw/ip/aes/dv/tests/aes_sideload_test.sv
@@ -28,7 +28,7 @@ class aes_sideload_test extends aes_base_test;
 
     cfg.message_len_min          = 16;    // one block (16bytes=128bits)
     cfg.message_len_max          = 128;   //
-    cfg.aad_len_min              = 16;    // one block (16bytes=128bits)
+    cfg.aad_len_min              = 0;     //
     cfg.aad_len_max              = 128;   //
     cfg.manual_operation_pct     = 50;    // only non sideload messages
     cfg.use_key_mask             = 0;

diff --git a/hw/ip/aes/dv/tests/aes_smoke_test.sv b/hw/ip/aes/dv/tests/aes_smoke_test.sv
@@ -28,7 +28,7 @@ class aes_smoke_test extends aes_base_test;
 
     cfg.message_len_min          = 16;    // one block (16bytes=128bits)
     cfg.message_len_max          = 32;    //
-    cfg.aad_len_min              = 16;    // one block (16bytes=128bits)
+    cfg.aad_len_min              = 0;     //
     cfg.aad_len_max              = 32;    //
     cfg.manual_operation_pct     = 50;
     cfg.use_key_mask             = 0;

diff --git a/hw/ip/aes/dv/tests/aes_stress_test.sv b/hw/ip/aes/dv/tests/aes_stress_test.sv
@@ -34,7 +34,7 @@ class aes_stress_test extends aes_base_test;
     cfg.message_len_min          = 7;    // bytes
     cfg.message_len_max          = 1023; // bytes
 
-    cfg.aad_len_min              = 7;    // bytes
+    cfg.aad_len_min              = 0;    // bytes
     cfg.aad_len_max              = 1023; // bytes
 
     cfg.fixed_data_en            = 0;