From d22c38a101f0fef79ac52f71ee1cf08763f6c0b2 Mon Sep 17 00:00:00 2001 From: Pascal Nasahl Date: Fri, 14 Feb 2025 12:51:22 +0000 Subject: [PATCH] [aes,dv] Set min block length to 0 As providing no AAD and no PTX block in AES-GCM mode is also possible, test this by adapting the corresponding test configs and setting message_len_min and aad_len_min = 0. Signed-off-by: Pascal Nasahl --- hw/ip/aes/dv/tests/aes_alert_reset_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_b2b_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_base_test.sv | 4 +++- hw/ip/aes/dv/tests/aes_clear_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_config_error_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_deinit_test.sv | 6 +++--- hw/ip/aes/dv/tests/aes_fi_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_manual_config_err_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_reseed_test.sv | 5 ++--- hw/ip/aes/dv/tests/aes_sideload_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_smoke_test.sv | 4 ++-- hw/ip/aes/dv/tests/aes_stress_test.sv | 4 ++-- 12 files changed, 26 insertions(+), 25 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..499ec06216a1a 100644 --- a/hw/ip/aes/dv/tests/aes_alert_reset_test.sv +++ b/hw/ip/aes/dv/tests/aes_alert_reset_test.sv @@ -27,9 +27,9 @@ class aes_alert_reset_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 7; // one block (16bytes=128bits) + cfg.message_len_min = 0; // 16 = 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..4b36a3ad316f1 100644 --- a/hw/ip/aes/dv/tests/aes_b2b_test.sv +++ b/hw/ip/aes/dv/tests/aes_b2b_test.sv @@ -28,10 +28,10 @@ class aes_b2b_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 7; // bytes + cfg.message_len_min = 0; // 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 index 2648ac8e584d9..3cf1053da6412 100644 --- a/hw/ip/aes/dv/tests/aes_base_test.sv +++ b/hw/ip/aes/dv/tests/aes_base_test.sv @@ -33,8 +33,10 @@ class aes_base_test extends cip_base_test #( cfg.write_prob = 80; cfg.num_messages_min = 1; cfg.num_messages_max = 31; - cfg.message_len_min = 1; + cfg.message_len_min = 0; 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 index d1fd531f4174a..733c60243c4e1 100644 --- a/hw/ip/aes/dv/tests/aes_clear_test.sv +++ b/hw/ip/aes/dv/tests/aes_clear_test.sv @@ -27,9 +27,9 @@ class aes_clear_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 17; + cfg.message_len_min = 0; 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..d88358a76e1b9 100644 --- a/hw/ip/aes/dv/tests/aes_config_error_test.sv +++ b/hw/ip/aes/dv/tests/aes_config_error_test.sv @@ -32,9 +32,9 @@ class aes_config_error_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 16; // one block (16bytes=128bits) + cfg.message_len_min = 0; // 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..00e92ee50fc74 100644 --- a/hw/ip/aes/dv/tests/aes_deinit_test.sv +++ b/hw/ip/aes/dv/tests/aes_deinit_test.sv @@ -28,12 +28,12 @@ class aes_deinit_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 16; // one block (16bytes=128bits) + cfg.message_len_min = 0; // 16 = one block (16bytes=128bits) 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..4500fa2a19f60 100644 --- a/hw/ip/aes/dv/tests/aes_fi_test.sv +++ b/hw/ip/aes/dv/tests/aes_fi_test.sv @@ -28,9 +28,9 @@ class aes_fi_test extends aes_base_test; cfg.ctr_weight = 75; cfg.gcm_weight = 5; - cfg.message_len_min = 1; // one block (16bytes=128bits) + cfg.message_len_min = 0; // 16 = 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..79221a189b6ca 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 @@ -35,9 +35,9 @@ class aes_manual_config_err_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 16; + cfg.message_len_min = 0; 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..b36fa155005d6 100644 --- a/hw/ip/aes/dv/tests/aes_reseed_test.sv +++ b/hw/ip/aes/dv/tests/aes_reseed_test.sv @@ -27,10 +27,9 @@ class aes_reseed_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 7; // bytes + cfg.message_len_min = 0; // 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..0e26f28f7dbd8 100644 --- a/hw/ip/aes/dv/tests/aes_sideload_test.sv +++ b/hw/ip/aes/dv/tests/aes_sideload_test.sv @@ -26,9 +26,9 @@ class aes_sideload_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 16; // one block (16bytes=128bits) + cfg.message_len_min = 0; // 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..84971d126d1e5 100644 --- a/hw/ip/aes/dv/tests/aes_smoke_test.sv +++ b/hw/ip/aes/dv/tests/aes_smoke_test.sv @@ -26,9 +26,9 @@ class aes_smoke_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 16; // one block (16bytes=128bits) + cfg.message_len_min = 0; // 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..a917070fe78ee 100644 --- a/hw/ip/aes/dv/tests/aes_stress_test.sv +++ b/hw/ip/aes/dv/tests/aes_stress_test.sv @@ -31,10 +31,10 @@ class aes_stress_test extends aes_base_test; cfg.cfb_weight = 10; cfg.gcm_weight = 10; - cfg.message_len_min = 7; // bytes + cfg.message_len_min = 0; // 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;