Re: [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test cases to cryptodev

[Anoob Joseph <anoobj@marvell.com>]

Minor nit inline.

Acked-by: Anoob Joseph <anoobj@marvell.com>

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Arek Kusztal
> Sent: Thursday, June 11, 2020 12:48 AM
> To: dev@dpdk.org
> Cc: akhil.goyal@nxp.com; fiona.trahe@intel.com; Arek Kusztal
> <arkadiuszx.kusztal@intel.com>
> Subject: [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test
> cases to cryptodev
> 
> This patch adds Chacha20-Poly1305 implementation to cryptodev tests.
> 
> Signed-off-by: Arek Kusztal <arkadiuszx.kusztal@intel.com>
> ---
> v4:
> - resent in 20.08 DPDK window
> 
>  app/test/test_cryptodev.c                   | 18 ++++++-
>  app/test/test_cryptodev_aead_test_vectors.h | 75
> +++++++++++++++++++++++++++++
>  2 files changed, 92 insertions(+), 1 deletion(-)
> 
> diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index
> 8f63146..2f94ab1 100644
> --- a/app/test/test_cryptodev.c
> +++ b/app/test/test_cryptodev.c
> @@ -11502,6 +11502,18 @@
> auth_decrypt_AES128CBC_HMAC_SHA1_esn_check(void)
>  			&aes128cbc_hmac_sha1_aad_test_vector);
>  }
> 
> +static int
> +test_chacha20_poly1305_encrypt_test_case_rfc8439(void)
> +{
> +	return
> test_authenticated_encryption(&chacha20_poly1305_case_rfc8439);
> +}
> +
> +static int
> +test_chacha20_poly1305_decrypt_test_case_rfc8439(void)
> +{
> +	return
> test_authenticated_decryption(&chacha20_poly1305_case_rfc8439);
> +}
> +
>  #ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
> 
>  /* global AESNI slave IDs for the scheduler test */ @@ -11956,7 +11968,11
> @@ static struct unit_test_suite cryptodev_testsuite  = {
>  			test_AES_GMAC_authentication_test_case_4),
>  		TEST_CASE_ST(ut_setup, ut_teardown,
> 
> 	test_AES_GMAC_authentication_verify_test_case_4),
> -
> +		/** Chacha20-Poly1305 */
> +		TEST_CASE_ST(ut_setup, ut_teardown,
> +
> 	test_chacha20_poly1305_encrypt_test_case_rfc8439),
> +		TEST_CASE_ST(ut_setup, ut_teardown,
> +

[Anoob] Might be better to keep a blank line between individual test blocks. Can keep the existing blank line (which got removed in this patch) and add a new one after.
 
> 	test_chacha20_poly1305_decrypt_test_case_rfc8439),
>  		/** SNOW 3G encrypt only (UEA2) */
>  		TEST_CASE_ST(ut_setup, ut_teardown,
>  			test_snow3g_encryption_test_case_1),
> diff --git a/app/test/test_cryptodev_aead_test_vectors.h
> b/app/test/test_cryptodev_aead_test_vectors.h
> index e62fdb2..140f253 100644
> --- a/app/test/test_cryptodev_aead_test_vectors.h
> +++ b/app/test/test_cryptodev_aead_test_vectors.h
> @@ -3823,4 +3823,79 @@ static const struct aead_test_data
> ccm_test_case_256_3 = {
>  		.len = 8
>  	}
>  };
> +static uint8_t chacha_aad_rfc8439[] = {
> +			0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3,
> +			0xc4, 0xc5, 0xc6, 0xc7
> +};
> +
> +static const struct aead_test_data chacha20_poly1305_case_rfc8439 = {
> +	.algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305,
> +	.key = {
> +		.data = {
> +			0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
> +			0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
> +			0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
> +			0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
> +		},
> +		.len = 32
> +	},
> +	.iv = {
> +		.data = {
> +			0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43,
> +			0x44, 0x45, 0x46, 0x47
> +		},
> +		.len = 12
> +	},
> +	.aad = {
> +		.data = chacha_aad_rfc8439,
> +		.len = 12
> +	},
> +	.plaintext = {
> +		.data = {
> +			0x4c, 0x61, 0x64, 0x69, 0x65, 0x73, 0x20, 0x61,
> +			0x6e, 0x64, 0x20, 0x47, 0x65, 0x6e, 0x74, 0x6c,
> +			0x65, 0x6d, 0x65, 0x6e, 0x20, 0x6f, 0x66, 0x20,
> +			0x74, 0x68, 0x65, 0x20, 0x63, 0x6c, 0x61, 0x73,
> +			0x73, 0x20, 0x6f, 0x66, 0x20, 0x27, 0x39, 0x39,
> +			0x3a, 0x20, 0x49, 0x66, 0x20, 0x49, 0x20, 0x63,
> +			0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6f, 0x66, 0x66,
> +			0x65, 0x72, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x6f,
> +			0x6e, 0x6c, 0x79, 0x20, 0x6f, 0x6e, 0x65, 0x20,
> +			0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20,
> +			0x74, 0x68, 0x65, 0x20, 0x66, 0x75, 0x74, 0x75,
> +			0x72, 0x65, 0x2c, 0x20, 0x73, 0x75, 0x6e, 0x73,
> +			0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x77, 0x6f,
> +			0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, 0x20, 0x69,
> +			0x74, 0x2e
> +		},
> +		.len = 114
> +	},
> +	.ciphertext = {
> +		.data = {
> +			0xd3, 0x1a, 0x8d, 0x34, 0x64, 0x8e, 0x60, 0xdb,
> +			0x7b, 0x86, 0xaf, 0xbc, 0x53, 0xef, 0x7e, 0xc2,
> +			0xa4, 0xad, 0xed, 0x51, 0x29, 0x6e, 0x08, 0xfe,
> +			0xa9, 0xe2, 0xb5, 0xa7, 0x36, 0xee, 0x62, 0xd6,
> +			0x3d, 0xbe, 0xa4, 0x5e, 0x8c, 0xa9, 0x67, 0x12,
> +			0x82, 0xfa, 0xfb, 0x69, 0xda, 0x92, 0x72, 0x8b,
> +			0x1a, 0x71, 0xde, 0x0a, 0x9e, 0x06, 0x0b, 0x29,
> +			0x05, 0xd6, 0xa5, 0xb6, 0x7e, 0xcd, 0x3b, 0x36,
> +			0x92, 0xdd, 0xbd, 0x7f, 0x2d, 0x77, 0x8b, 0x8c,
> +			0x98, 0x03, 0xae, 0xe3, 0x28, 0x09, 0x1b, 0x58,
> +			0xfa, 0xb3, 0x24, 0xe4, 0xfa, 0xd6, 0x75, 0x94,
> +			0x55, 0x85, 0x80, 0x8b, 0x48, 0x31, 0xd7, 0xbc,
> +			0x3f, 0xf4, 0xde, 0xf0, 0x8e, 0x4b, 0x7a, 0x9d,
> +			0xe5, 0x76, 0xd2, 0x65, 0x86, 0xce, 0xc6, 0x4b,
> +			0x61, 0x16
> +		},
> +		.len = 114
> +	},
> +	.auth_tag = {
> +		.data = {
> +			0x1a, 0xe1, 0x0b, 0x59, 0x4f, 0x09, 0xe2, 0x6a,
> +			0x7e, 0x90, 0x2e, 0xcb, 0xd0, 0x60, 0x06, 0x91
> +		},
> +		.len = 16
> +	}
> +};
>  #endif /* TEST_CRYPTODEV_AEAD_TEST_VECTORS_H_ */
> --
> 2.1.0