From patchwork Fri Mar 3 09:38:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 124776 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1EACD41DC6; Fri, 3 Mar 2023 10:38:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC2684161A; Fri, 3 Mar 2023 10:38:29 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id C5F2A400D6 for ; Fri, 3 Mar 2023 10:38:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677836308; x=1709372308; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zQa1jv5my/ztyC20B8U60w0Os8R8CYhhy1h1J02PuKw=; b=mmNBhpeKLAvyg+zciIIOkgly2CS5ZduH8K7P660SUNs+ZAsjVwCh94dO +nHq6bDe++wdlbD4VRuqtoY5GISqFmcEmkxxbAEduu2b3Fxn5vOcCklB9 LlGz/W4Zwf49oUd4NdbTug3RdWRgqOWT+WTesESGLH+o3Ci0dhfjiqbPz Ku006j7/19iv15wLt17i7hGOSdT33f5AZzev8DAMmFHmY9x4saTGgqD2i Txzhf7G0SYNDSi89FZ64SmoAthKVuXz0I/rc4EkBD1oDwtDWBWLaW+bOM SkuQPqPJxVeO03mVJU/04ea8OL4SNADlCjWMu/xrEpNDmNP7UNzR7L0ms w==; X-IronPort-AV: E=McAfee;i="6500,9779,10637"; a="362600839" X-IronPort-AV: E=Sophos;i="5.98,230,1673942400"; d="scan'208";a="362600839" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2023 01:38:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10637"; a="739444726" X-IronPort-AV: E=Sophos;i="5.98,230,1673942400"; d="scan'208";a="739444726" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by fmsmga008.fm.intel.com with ESMTP; 03 Mar 2023 01:38:25 -0800 From: Ciara Power To: Akhil Goyal , Fan Zhang Cc: dev@dpdk.org, kai.ji@intel.com, pablo.de.lara.guarch@intel.com, Ciara Power , Brian Dooley Subject: [PATCH v2 1/5] test/crypto: improve readability of ZUC256 tests Date: Fri, 3 Mar 2023 09:38:17 +0000 Message-Id: <20230303093821.2367309-2-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230303093821.2367309-1-ciara.power@intel.com> References: <20230301163916.2248543-1-ciara.power@intel.com> <20230303093821.2367309-1-ciara.power@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org There were some ZUC256 tests for hash generate and hash verify mixed in with the ZUC128 tests, with no indication in the test name that they were for ZUC256. These are now grouped with other ZUC256 tests, and all ZUC256 hash test names are modified to be more uniform, and indicate the digest length as this can vary with ZUC256. Signed-off-by: Ciara Power Acked-by: Brian Dooley --- app/test/test_cryptodev.c | 125 +++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index aa831d79a2..ca7f10557c 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -7385,27 +7385,6 @@ test_zuc_hash_generate_test_case_8(void) RTE_CRYPTO_AUTH_OP_GENERATE); } -static int -test_zuc_hash_generate_test_case_9(void) -{ - return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_32b, - RTE_CRYPTO_AUTH_OP_GENERATE); -} - -static int -test_zuc_hash_generate_test_case_10(void) -{ - return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_64b, - RTE_CRYPTO_AUTH_OP_GENERATE); -} - -static int -test_zuc_hash_generate_test_case_11(void) -{ - return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_128b, - RTE_CRYPTO_AUTH_OP_GENERATE); -} - static int test_zuc_hash_verify_test_case_1(void) { @@ -7462,27 +7441,6 @@ test_zuc_hash_verify_test_case_8(void) RTE_CRYPTO_AUTH_OP_VERIFY); } -static int -test_zuc_hash_verify_test_case_9(void) -{ - return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_32b, - RTE_CRYPTO_AUTH_OP_VERIFY); -} - -static int -test_zuc_hash_verify_test_case_10(void) -{ - return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_64b, - RTE_CRYPTO_AUTH_OP_VERIFY); -} - -static int -test_zuc_hash_verify_test_case_11(void) -{ - return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_128b, - RTE_CRYPTO_AUTH_OP_VERIFY); -} - static int test_zuc_cipher_auth_test_case_1(void) { @@ -7608,29 +7566,71 @@ test_zuc256_decryption_test_case_2(void) } static int -test_zuc256_authentication_test_case_1(void) +test_zuc256_hash_generate_4b_tag_test_case_1(void) { return test_zuc_authentication(&zuc256_test_case_auth_1, 0); } static int -test_zuc256_authentication_test_case_2(void) +test_zuc256_hash_generate_4b_tag_test_case_2(void) { return test_zuc_authentication(&zuc256_test_case_auth_2, 0); } static int -test_zuc256_authentication_verify_test_case_1(void) +test_zuc256_hash_generate_4b_tag_test_case_3(void) +{ + return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_32b, + RTE_CRYPTO_AUTH_OP_GENERATE); +} + +static int +test_zuc256_hash_generate_8b_tag_test_case_1(void) +{ + return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_64b, + RTE_CRYPTO_AUTH_OP_GENERATE); +} + +static int +test_zuc256_hash_generate_16b_tag_test_case_1(void) +{ + return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_128b, + RTE_CRYPTO_AUTH_OP_GENERATE); +} + +static int +test_zuc256_hash_verify_4b_tag_test_case_1(void) { return test_zuc_authentication(&zuc256_test_case_auth_1, 1); } static int -test_zuc256_authentication_verify_test_case_2(void) +test_zuc256_hash_verify_4b_tag_test_case_2(void) { return test_zuc_authentication(&zuc256_test_case_auth_2, 1); } +static int +test_zuc256_hash_verify_4b_tag_test_case_3(void) +{ + return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_32b, + RTE_CRYPTO_AUTH_OP_VERIFY); +} + +static int +test_zuc256_hash_verify_8b_tag_test_case_1(void) +{ + return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_64b, + RTE_CRYPTO_AUTH_OP_VERIFY); +} + +static int +test_zuc256_hash_verify_16b_tag_test_case_1(void) +{ + return test_zuc_authentication(&zuc_test_case_auth_4000b_mac_128b, + RTE_CRYPTO_AUTH_OP_VERIFY); +} + static int test_mixed_check_if_unsupported(const struct mixed_cipher_auth_test_data *tdata) { @@ -16409,12 +16409,6 @@ static struct unit_test_suite cryptodev_zuc_testsuite = { test_zuc_hash_generate_test_case_7), TEST_CASE_ST(ut_setup, ut_teardown, test_zuc_hash_generate_test_case_8), - TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc_hash_generate_test_case_9), - TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc_hash_generate_test_case_10), - TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc_hash_generate_test_case_11), /** ZUC verify (EIA3) */ TEST_CASE_ST(ut_setup, ut_teardown, @@ -16433,13 +16427,6 @@ static struct unit_test_suite cryptodev_zuc_testsuite = { test_zuc_hash_verify_test_case_7), TEST_CASE_ST(ut_setup, ut_teardown, test_zuc_hash_verify_test_case_8), - TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc_hash_verify_test_case_9), - TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc_hash_verify_test_case_10), - TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc_hash_verify_test_case_11), - /** ZUC alg-chain (EEA3/EIA3) */ TEST_CASE_ST(ut_setup, ut_teardown, @@ -16489,15 +16476,27 @@ static struct unit_test_suite cryptodev_zuc_testsuite = { /** ZUC-256 authentication only **/ TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc256_authentication_test_case_1), + test_zuc256_hash_generate_4b_tag_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_zuc256_hash_generate_4b_tag_test_case_2), TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc256_authentication_test_case_2), + test_zuc256_hash_generate_4b_tag_test_case_3), + TEST_CASE_ST(ut_setup, ut_teardown, + test_zuc256_hash_generate_8b_tag_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_zuc256_hash_generate_16b_tag_test_case_1), /** ZUC-256 authentication verify only **/ TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc256_authentication_verify_test_case_1), + test_zuc256_hash_verify_4b_tag_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_zuc256_hash_verify_4b_tag_test_case_2), + TEST_CASE_ST(ut_setup, ut_teardown, + test_zuc256_hash_verify_4b_tag_test_case_3), + TEST_CASE_ST(ut_setup, ut_teardown, + test_zuc256_hash_verify_8b_tag_test_case_1), TEST_CASE_ST(ut_setup, ut_teardown, - test_zuc256_authentication_verify_test_case_2), + test_zuc256_hash_verify_16b_tag_test_case_1), TEST_CASES_END() }