From: Aakash Sasidharan <asasidharan@marvell.com>
To: Akhil Goyal <gakhil@marvell.com>, Fan Zhang <fanzhang.oss@gmail.com>
Cc: <jerinj@marvell.com>, <anoobj@marvell.com>,
<vvelumuri@marvell.com>, <asasidharan@marvell.com>,
<dev@dpdk.org>
Subject: [PATCH v2 15/21] test/crypto: update framework to verify tls-1.3
Date: Tue, 12 Mar 2024 12:47:59 +0530 [thread overview]
Message-ID: <20240312071805.1354530-16-asasidharan@marvell.com> (raw)
In-Reply-To: <20240312071805.1354530-1-asasidharan@marvell.com>
From: Vidya Sagar Velumuri <vvelumuri@marvell.com>
Update the fields in preparation of test descriptor.
Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
---
app/test/test_cryptodev.c | 17 +++++---
app/test/test_cryptodev_security_tls_record.c | 43 ++++++++++++-------
app/test/test_cryptodev_security_tls_record.h | 10 ++---
3 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index aa9fffe50e..25777c1b1f 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -11889,8 +11889,9 @@ test_tls_record_proto_process(const struct tls_record_test_data td[],
ut_params->op->param1.tls_record.content_type = td[i].app_type;
/* Copy IV in crypto operation when IV generation is disabled */
- if (sess_type == RTE_SECURITY_TLS_SESS_TYPE_WRITE &&
- tls_record_xform.options.iv_gen_disable == 1) {
+ if ((sess_type == RTE_SECURITY_TLS_SESS_TYPE_WRITE) &&
+ (tls_record_xform.ver != RTE_SECURITY_VERSION_TLS_1_3) &&
+ (tls_record_xform.options.iv_gen_disable == 1)) {
uint8_t *iv;
int len;
@@ -12005,8 +12006,10 @@ test_tls_record_proto_all(const struct tls_record_test_flags *flags)
if (flags->zero_len)
payload_len = 0;
again:
- test_tls_record_td_prepare(sec_alg_list[i].param1, sec_alg_list[i].param2, flags,
- td_outb, nb_pkts, payload_len);
+ ret = test_tls_record_td_prepare(sec_alg_list[i].param1, sec_alg_list[i].param2,
+ flags, td_outb, nb_pkts, payload_len);
+ if (ret == TEST_SKIPPED)
+ continue;
ret = test_tls_record_proto_process(td_outb, td_inb, nb_pkts, true, flags);
if (ret == TEST_SKIPPED)
@@ -12218,8 +12221,10 @@ test_dtls_pkt_replay(const uint64_t seq_no[],
int ret;
for (i = 0; i < RTE_DIM(sec_alg_list); i++) {
- test_tls_record_td_prepare(sec_alg_list[i].param1, sec_alg_list[i].param2, flags,
- td_outb, nb_pkts, 0);
+ ret = test_tls_record_td_prepare(sec_alg_list[i].param1, sec_alg_list[i].param2,
+ flags, td_outb, nb_pkts, 0);
+ if (ret == TEST_SKIPPED)
+ continue;
for (idx = 0; idx < nb_pkts; idx++)
td_outb[idx].tls_record_xform.dtls_1_2.seq_no = seq_no[idx];
diff --git a/app/test/test_cryptodev_security_tls_record.c b/app/test/test_cryptodev_security_tls_record.c
index 498c4923e0..96d0a94731 100644
--- a/app/test/test_cryptodev_security_tls_record.c
+++ b/app/test/test_cryptodev_security_tls_record.c
@@ -70,7 +70,7 @@ test_tls_record_td_read_from_write(const struct tls_record_test_data *td_out,
}
}
-void
+int
test_tls_record_td_prepare(const struct crypto_param *param1, const struct crypto_param *param2,
const struct tls_record_test_flags *flags,
struct tls_record_test_data *td_array,
@@ -79,6 +79,10 @@ test_tls_record_td_prepare(const struct crypto_param *param1, const struct crypt
int i, min_padding, hdr_len, tls_pkt_size, mac_len = 0, exp_nonce_len = 0, roundup_len = 0;
struct tls_record_test_data *td = NULL;
+ if ((flags->tls_version == RTE_SECURITY_VERSION_TLS_1_3) &&
+ (param1->type != RTE_CRYPTO_SYM_XFORM_AEAD))
+ return TEST_SKIPPED;
+
memset(td_array, 0, nb_td * sizeof(*td));
for (i = 0; i < nb_td; i++) {
@@ -88,10 +92,17 @@ test_tls_record_td_prepare(const struct crypto_param *param1, const struct crypt
if (param1->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
/* Copy template for packet & key fields */
- if (flags->tls_version == RTE_SECURITY_VERSION_DTLS_1_2)
- memcpy(td, &dtls_test_data_aes_128_gcm, sizeof(*td));
- else
+ switch (flags->tls_version) {
+ case RTE_SECURITY_VERSION_TLS_1_2:
memcpy(td, &tls_test_data_aes_128_gcm_v1, sizeof(*td));
+ break;
+ case RTE_SECURITY_VERSION_DTLS_1_2:
+ memcpy(td, &dtls_test_data_aes_128_gcm, sizeof(*td));
+ break;
+ case RTE_SECURITY_VERSION_TLS_1_3:
+ memcpy(td, &tls13_test_data_aes_128_gcm, sizeof(*td));
+ break;
+ }
td->aead = true;
td->xform.aead.aead.algo = param1->alg.aead;
@@ -127,6 +138,7 @@ test_tls_record_td_prepare(const struct crypto_param *param1, const struct crypt
if (!td->aead) {
mac_len = td->xform.chain.auth.auth.digest_length;
+ min_padding = 1;
switch (td->xform.chain.cipher.cipher.algo) {
case RTE_CRYPTO_CIPHER_3DES_CBC:
roundup_len = 8;
@@ -143,30 +155,28 @@ test_tls_record_td_prepare(const struct crypto_param *param1, const struct crypt
}
} else {
mac_len = td->xform.aead.aead.digest_length;
+ min_padding = 0;
roundup_len = 0;
- exp_nonce_len = 8;
+ if (td->tls_record_xform.ver == RTE_SECURITY_VERSION_TLS_1_3)
+ exp_nonce_len = 0;
+ else
+ exp_nonce_len = 8;
}
switch (td->tls_record_xform.ver) {
case RTE_SECURITY_VERSION_TLS_1_2:
+ hdr_len = sizeof(struct rte_tls_hdr);
+ break;
case RTE_SECURITY_VERSION_TLS_1_3:
hdr_len = sizeof(struct rte_tls_hdr);
- if (td->aead)
- min_padding = 0;
- else
- min_padding = 1;
+ /* Add 1 byte for content type in packet */
+ tls_pkt_size += 1;
break;
case RTE_SECURITY_VERSION_DTLS_1_2:
hdr_len = sizeof(struct rte_dtls_hdr);
- if (td->aead)
- min_padding = 0;
- else
- min_padding = 1;
break;
default:
- hdr_len = 0;
- min_padding = 0;
- break;
+ return TEST_SKIPPED;
}
tls_pkt_size += mac_len;
@@ -186,6 +196,7 @@ test_tls_record_td_prepare(const struct crypto_param *param1, const struct crypt
td->output_text.len = tls_pkt_size;
}
+ return TEST_SUCCESS;
}
void
diff --git a/app/test/test_cryptodev_security_tls_record.h b/app/test/test_cryptodev_security_tls_record.h
index 05bd7a9862..21d25c02bf 100644
--- a/app/test/test_cryptodev_security_tls_record.h
+++ b/app/test/test_cryptodev_security_tls_record.h
@@ -137,11 +137,11 @@ int test_tls_record_sec_caps_verify(struct rte_security_tls_record_xform *tls_re
void test_tls_record_td_read_from_write(const struct tls_record_test_data *td_out,
struct tls_record_test_data *td_in);
-void test_tls_record_td_prepare(const struct crypto_param *param1,
- const struct crypto_param *param2,
- const struct tls_record_test_flags *flags,
- struct tls_record_test_data *td_array, int nb_td,
- unsigned int data_len);
+int test_tls_record_td_prepare(const struct crypto_param *param1,
+ const struct crypto_param *param2,
+ const struct tls_record_test_flags *flags,
+ struct tls_record_test_data *td_array, int nb_td,
+ unsigned int data_len);
void test_tls_record_td_update(struct tls_record_test_data td_inb[],
const struct tls_record_test_data td_outb[], int nb_td,
--
2.25.1
next prev parent reply other threads:[~2024-03-12 7:19 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 7:21 [PATCH 00/21] Improvements and new test cases Aakash Sasidharan
2024-03-05 7:21 ` [PATCH 01/21] test/security: enable AES-GCM in combined mode TLS Aakash Sasidharan
2024-03-05 7:21 ` [PATCH 02/21] test/security: add TLS 1.2 data walkthrough test Aakash Sasidharan
2024-03-05 7:21 ` [PATCH 03/21] test/security: add DTLS " Aakash Sasidharan
2024-03-05 7:21 ` [PATCH 04/21] test/security: add TLS SG " Aakash Sasidharan
2024-03-05 7:21 ` [PATCH 05/21] test/security: unit test for TLS packet corruption Aakash Sasidharan
2024-03-05 7:21 ` [PATCH 06/21] test/security: unit test for custom content verification Aakash Sasidharan
2024-03-05 7:21 ` [PATCH 07/21] test/cryptodev: allow zero packet length buffers Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 08/21] test/security: unit test to verify zero TLS records Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 09/21] test/security: add unit tests for DTLS-1.2 Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 10/21] test/security: add TLS/DTLS 1.2 AES-256-SHA384 vectors Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 11/21] test/security: add DTLS 1.2 anti-replay tests Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 12/21] test/security: add more DTLS anti-replay window sz Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 13/21] test/crypto: update verification of header Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 14/21] test/crypto: add TLS 1.3 vectors Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 15/21] test/crypto: update framework to verify tls-1.3 Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 16/21] test/crypto: test to verify hdr corruption in TLS Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 17/21] test/crypto: test to verify custom content type " Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 18/21] test/crypto: test to verify zero len record " Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 19/21] test/crypto: unit tests to verify padding " Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 20/21] test/crypto: unit tests for padding in DTLS-1.2 Aakash Sasidharan
2024-03-05 7:22 ` [PATCH 21/21] test/security: add out of place sgl test case for TLS 1.2 Aakash Sasidharan
2024-03-08 13:35 ` Akhil Goyal
2024-03-05 13:23 ` [PATCH 00/21] Improvements and new test cases Anoob Joseph
2024-03-12 7:17 ` [PATCH v2 " Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 01/21] test/security: enable AES-GCM in combined mode TLS Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 02/21] test/security: add TLS 1.2 data walkthrough test Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 03/21] test/security: add DTLS " Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 04/21] test/security: add TLS SG " Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 05/21] test/security: unit test for TLS packet corruption Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 06/21] test/security: unit test for custom content verification Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 07/21] test/cryptodev: allow zero packet length buffers Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 08/21] test/security: unit test to verify zero TLS records Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 09/21] test/security: add unit tests for DTLS-1.2 Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 10/21] test/security: add TLS/DTLS 1.2 AES-256-SHA384 vectors Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 11/21] test/security: add DTLS 1.2 anti-replay tests Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 12/21] test/security: add more DTLS anti-replay window sz Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 13/21] test/crypto: update verification of header Aakash Sasidharan
2024-03-12 7:17 ` [PATCH v2 14/21] test/crypto: add TLS 1.3 vectors Aakash Sasidharan
2024-03-12 7:17 ` Aakash Sasidharan [this message]
2024-03-12 7:18 ` [PATCH v2 16/21] test/crypto: test to verify hdr corruption in TLS Aakash Sasidharan
2024-03-12 7:18 ` [PATCH v2 17/21] test/crypto: test to verify custom content type " Aakash Sasidharan
2024-03-12 7:18 ` [PATCH v2 18/21] test/crypto: test to verify zero len record " Aakash Sasidharan
2024-03-12 7:18 ` [PATCH v2 19/21] test/crypto: unit tests to verify padding " Aakash Sasidharan
2024-03-12 7:18 ` [PATCH v2 20/21] test/crypto: unit tests for padding in DTLS-1.2 Aakash Sasidharan
2024-03-12 7:18 ` [PATCH v2 21/21] test/security: add out of place sgl test case for TLS 1.2 Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 00/21] Improvements and new test cases Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 01/21] test/security: enable AES-GCM in combined mode TLS Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 02/21] test/security: add TLS 1.2 data walkthrough test Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 03/21] test/security: add DTLS " Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 04/21] test/security: add TLS SG " Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 05/21] test/security: unit test for TLS packet corruption Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 06/21] test/security: unit test for custom content verification Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 07/21] test/cryptodev: allow zero packet length buffers Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 08/21] test/security: unit test to verify zero TLS records Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 09/21] test/security: add unit tests for DTLS-1.2 Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 10/21] test/security: add TLS/DTLS 1.2 AES-256-SHA384 vectors Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 11/21] test/security: add DTLS 1.2 anti-replay tests Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 12/21] test/security: add more DTLS anti-replay window sz Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 13/21] test/crypto: update verification of header Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 14/21] test/crypto: add TLS 1.3 vectors Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 15/21] test/crypto: update framework to verify tls-1.3 Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 16/21] test/crypto: test to verify hdr corruption in TLS Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 17/21] test/crypto: test to verify custom content type " Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 18/21] test/crypto: test to verify zero len record " Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 19/21] test/crypto: unit tests to verify padding " Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 20/21] test/crypto: unit tests for padding in DTLS-1.2 Aakash Sasidharan
2024-03-12 17:51 ` [PATCH v3 21/21] test/security: add out of place sgl test case for TLS 1.2 Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 00/21] Improvements and new test cases Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 01/21] test/security: enable AES-GCM in combined mode TLS Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 02/21] test/security: add TLS 1.2 data walkthrough test Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 03/21] test/security: add DTLS " Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 04/21] test/security: add TLS SG " Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 05/21] test/security: unit test for TLS packet corruption Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 06/21] test/security: unit test for custom content verification Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 07/21] test/cryptodev: allow zero packet length buffers Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 08/21] test/security: unit test to verify zero TLS records Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 09/21] test/security: add unit tests for DTLS-1.2 Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 10/21] test/security: add TLS/DTLS 1.2 AES-256-SHA384 vectors Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 11/21] test/security: add DTLS 1.2 anti-replay tests Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 12/21] test/security: add more DTLS anti-replay window sz Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 13/21] test/crypto: update verification of header Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 14/21] test/crypto: add TLS 1.3 vectors Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 15/21] test/crypto: update framework to verify tls-1.3 Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 16/21] test/crypto: test to verify hdr corruption in TLS Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 17/21] test/crypto: test to verify custom content type " Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 18/21] test/crypto: test to verify zero len record " Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 19/21] test/crypto: unit tests to verify padding " Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 20/21] test/crypto: unit tests for padding in DTLS-1.2 Aakash Sasidharan
2024-03-13 5:50 ` [PATCH v4 21/21] test/security: add out of place sgl test case for TLS 1.2 Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 00/21] Improvements and new test cases Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 01/21] test/security: enable AES-GCM in combined mode TLS Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 02/21] test/security: add TLS 1.2 data walkthrough test Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 03/21] test/security: add DTLS " Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 04/21] test/security: add TLS SG " Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 05/21] test/security: unit test for TLS packet corruption Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 06/21] test/security: unit test for custom content verification Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 07/21] test/cryptodev: allow zero packet length buffers Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 08/21] test/security: unit test to verify zero TLS records Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 09/21] test/security: add unit tests for DTLS-1.2 Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 10/21] test/security: add TLS/DTLS 1.2 AES-256-SHA384 vectors Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 11/21] test/security: add DTLS 1.2 anti-replay tests Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 12/21] test/security: add more DTLS anti-replay window sz Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 13/21] test/crypto: update verification of header Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 14/21] test/crypto: add TLS 1.3 vectors Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 15/21] test/crypto: update framework to verify tls-1.3 Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 16/21] test/crypto: test to verify hdr corruption in TLS Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 17/21] test/crypto: test to verify custom content type " Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 18/21] test/crypto: test to verify zero len record " Aakash Sasidharan
2024-03-13 10:58 ` [PATCH v5 19/21] test/crypto: unit tests to verify padding " Aakash Sasidharan
2024-03-13 10:59 ` [PATCH v5 20/21] test/crypto: unit tests for padding in DTLS-1.2 Aakash Sasidharan
2024-03-13 10:59 ` [PATCH v5 21/21] test/security: add out of place sgl test case for TLS 1.2 Aakash Sasidharan
2024-03-13 14:25 ` [PATCH v5 00/21] Improvements and new test cases Akhil Goyal
2024-03-15 18:27 ` Patrick Robb
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240312071805.1354530-16-asasidharan@marvell.com \
--to=asasidharan@marvell.com \
--cc=anoobj@marvell.com \
--cc=dev@dpdk.org \
--cc=fanzhang.oss@gmail.com \
--cc=gakhil@marvell.com \
--cc=jerinj@marvell.com \
--cc=vvelumuri@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).