From 7c9720e0aceae73734ec2246ed084cdd002890e2 Mon Sep 17 00:00:00 2001 From: Pascal Nasahl Date: Fri, 14 Feb 2025 12:51:22 +0000 Subject: [PATCH] [aes,dv] Set GCM AAD min block length to 0 As providing no AAD blocks in AES-GCM mode is also possible, test this by adapting the corresponding test configs. Signed-off-by: Pascal Nasahl --- hw/ip/aes/dv/tests/aes_alert_reset_test.sv | 2 +- hw/ip/aes/dv/tests/aes_b2b_test.sv | 2 +- hw/ip/aes/dv/tests/aes_clear_test.sv | 2 +- hw/ip/aes/dv/tests/aes_config_error_test.sv | 2 +- hw/ip/aes/dv/tests/aes_deinit_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_fi_test.sv | 2 +- hw/ip/aes/dv/tests/aes_manual_config_err_test.sv | 2 +- hw/ip/aes/dv/tests/aes_reseed_test.sv | 3 +-- hw/ip/aes/dv/tests/aes_sideload_test.sv | 2 +- hw/ip/aes/dv/tests/aes_smoke_test.sv | 2 +- hw/ip/aes/dv/tests/aes_stress_test.sv | 2 +- 11 files changed, 12 insertions(+), 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 index b0f4cca28a43b..485a098a3eb6a 100644 --- 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 index 2207db5bf6f79..fcabbe9d5b833 100644 --- 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_clear_test.sv b/hw/ip/aes/dv/tests/aes_clear_test.sv index d1fd531f4174a..2ed84f6688f2b 100644 --- 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 index 25cfc79a78ee1..011ff28ef6480 100644 --- 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 index 222bbbd465a47..d9958d7f592e9 100644 --- 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 index e2936cc819210..f22fc47613735 100644 --- 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 index ce36ffc55bb08..d233b0dd84260 100644 --- 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 index f8fa49457667f..f6a6bb177e95a 100644 --- 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 index e353c060ce12c..403b7ab54944b 100644 --- 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 index ed9266935bf5a..52f9f3f792e83 100644 --- 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 index 6f8604d3ef819..4ea6af3730efd 100644 --- 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;