* [dpdk-dev] [PATCH v4 1/2] crypto/qat: add chacha poly implementation
@ 2020-06-10 19:18 Arek Kusztal
2020-06-10 19:18 ` [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test cases to cryptodev Arek Kusztal
0 siblings, 1 reply; 4+ messages in thread
From: Arek Kusztal @ 2020-06-10 19:18 UTC (permalink / raw)
To: dev; +Cc: akhil.goyal, fiona.trahe, Arek Kusztal
This patchset adds Chacha20-Poly1305 implementation to Intel
QuickAssist Technology pmd.
Signed-off-by: Arek Kusztal <arkadiuszx.kusztal@intel.com>
---
v4:
- resent in 20.08 DPDK window
This patch depends on "crypto/qat: add handling of multi process[1]."
[1] http://patchwork.dpdk.org/patch/71213/
doc/guides/cryptodevs/features/qat.ini | 13 +--
doc/guides/cryptodevs/qat.rst | 1 +
doc/guides/rel_notes/release_20_08.rst | 4 +
drivers/common/qat/qat_adf/icp_qat_hw.h | 10 ++-
drivers/crypto/qat/qat_sym_capabilities.h | 32 +++++++
drivers/crypto/qat/qat_sym_pmd.c | 1 +
drivers/crypto/qat/qat_sym_session.c | 141 ++++++++++++++++--------------
7 files changed, 127 insertions(+), 75 deletions(-)
diff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini
index a722419..e4ae28f 100644
--- a/doc/guides/cryptodevs/features/qat.ini
+++ b/doc/guides/cryptodevs/features/qat.ini
@@ -65,12 +65,13 @@ AES CMAC (128) = Y
; Supported AEAD algorithms of the 'qat' crypto driver.
;
[AEAD]
-AES GCM (128) = Y
-AES GCM (192) = Y
-AES GCM (256) = Y
-AES CCM (128) = Y
-AES CCM (192) = Y
-AES CCM (256) = Y
+AES GCM (128) = Y
+AES GCM (192) = Y
+AES GCM (256) = Y
+AES CCM (128) = Y
+AES CCM (192) = Y
+AES CCM (256) = Y
+CHACHA20-POLY1305 = Y
;
; Supported Asymmetric algorithms of the 'qat' crypto driver.
diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index c2cc3d5..04860d4 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -75,6 +75,7 @@ Supported AEAD algorithms:
* ``RTE_CRYPTO_AEAD_AES_GCM``
* ``RTE_CRYPTO_AEAD_AES_CCM``
+* ``RTE_CRYPTO_AEAD_CHACHA20_POLY1305``
Supported Chains
diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst
index 39064af..b5f39f5 100644
--- a/doc/guides/rel_notes/release_20_08.rst
+++ b/doc/guides/rel_notes/release_20_08.rst
@@ -56,6 +56,10 @@ New Features
Also, make sure to start the actual text at the margin.
=========================================================
+* **Updated the Intel QuickAssist Technology (QAT) symmetric crypto PMD.**
+
+ Added Chacha20-Poly1305 AEAD algorithm.
+
Removed Items
-------------
diff --git a/drivers/common/qat/qat_adf/icp_qat_hw.h b/drivers/common/qat/qat_adf/icp_qat_hw.h
index cef6486..fdc0f19 100644
--- a/drivers/common/qat/qat_adf/icp_qat_hw.h
+++ b/drivers/common/qat/qat_adf/icp_qat_hw.h
@@ -204,7 +204,9 @@ enum icp_qat_hw_cipher_algo {
ICP_QAT_HW_CIPHER_ALGO_KASUMI = 7,
ICP_QAT_HW_CIPHER_ALGO_SNOW_3G_UEA2 = 8,
ICP_QAT_HW_CIPHER_ALGO_ZUC_3G_128_EEA3 = 9,
- ICP_QAT_HW_CIPHER_DELIMITER = 10
+ ICP_QAT_HW_CIPHER_ALGO_SM4 = 10,
+ ICP_QAT_HW_CIPHER_ALGO_CHACHA20_POLY1305 = 11,
+ ICP_QAT_HW_CIPHER_DELIMITER = 12
};
enum icp_qat_hw_cipher_mode {
@@ -306,6 +308,12 @@ enum icp_qat_hw_cipher_convert {
#define ICP_QAT_HW_ZUC_3G_EEA3_KEY_SZ 16
#define ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ 16
#define ICP_QAT_HW_MODE_F8_NUM_REG_TO_CLEAR 2
+#define ICP_QAT_HW_CHACHAPOLY_KEY_SZ 32
+#define ICP_QAT_HW_CHACHAPOLY_IV_SZ 12
+#define ICP_QAT_HW_CHACHAPOLY_BLK_SZ 64
+#define ICP_QAT_HW_SPC_CTR_SZ 16
+#define ICP_QAT_HW_CHACHAPOLY_ICV_SZ 16
+#define ICP_QAT_HW_CHACHAPOLY_AAD_MAX_LOG 14
#define ICP_QAT_HW_CIPHER_MAX_KEY_SZ ICP_QAT_HW_AES_256_F8_KEY_SZ
diff --git a/drivers/crypto/qat/qat_sym_capabilities.h b/drivers/crypto/qat/qat_sym_capabilities.h
index ff691ce..f9aec89 100644
--- a/drivers/crypto/qat/qat_sym_capabilities.h
+++ b/drivers/crypto/qat/qat_sym_capabilities.h
@@ -699,4 +699,36 @@
}, } \
}
+#define QAT_EXTRA_GEN3_SYM_CAPABILITIES \
+ { /* Chacha20-Poly1305 */ \
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, \
+ {.sym = { \
+ .xform_type = RTE_CRYPTO_SYM_XFORM_AEAD, \
+ {.aead = { \
+ .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, \
+ .block_size = 64, \
+ .key_size = { \
+ .min = 32, \
+ .max = 32, \
+ .increment = 0 \
+ }, \
+ .digest_size = { \
+ .min = 16, \
+ .max = 16, \
+ .increment = 0 \
+ }, \
+ .aad_size = { \
+ .min = 0, \
+ .max = 240, \
+ .increment = 1 \
+ }, \
+ .iv_size = { \
+ .min = 12, \
+ .max = 12, \
+ .increment = 0 \
+ }, \
+ }, } \
+ }, } \
+ }
+
#endif /* _QAT_SYM_CAPABILITIES_H_ */
diff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c
index bdbf30d..bd30fd8 100644
--- a/drivers/crypto/qat/qat_sym_pmd.c
+++ b/drivers/crypto/qat/qat_sym_pmd.c
@@ -32,6 +32,7 @@ static const struct rte_cryptodev_capabilities qat_gen2_sym_capabilities[] = {
static const struct rte_cryptodev_capabilities qat_gen3_sym_capabilities[] = {
QAT_BASE_GEN1_SYM_CAPABILITIES,
QAT_EXTRA_GEN2_SYM_CAPABILITIES,
+ QAT_EXTRA_GEN3_SYM_CAPABILITIES,
RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
};
diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index 58bdbd3..7f65ece 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -621,69 +621,68 @@ qat_sym_session_set_parameters(struct rte_cryptodev *dev,
}
static int
-qat_sym_session_handle_single_pass(struct qat_sym_dev_private *internals,
- struct qat_sym_session *session,
+qat_sym_session_handle_single_pass(struct qat_sym_session *session,
struct rte_crypto_aead_xform *aead_xform)
{
- enum qat_device_gen qat_dev_gen = internals->qat_dev->qat_dev_gen;
+ struct icp_qat_fw_la_cipher_req_params *cipher_param =
+ (void *) &session->fw_req.serv_specif_rqpars;
- if (qat_dev_gen == QAT_GEN3 &&
- aead_xform->iv.length == QAT_AES_GCM_SPC_IV_SIZE) {
- /* Use faster Single-Pass GCM */
- struct icp_qat_fw_la_cipher_req_params *cipher_param =
- (void *) &session->fw_req.serv_specif_rqpars;
-
- session->is_single_pass = 1;
- session->min_qat_dev_gen = QAT_GEN3;
- session->qat_cmd = ICP_QAT_FW_LA_CMD_CIPHER;
+ session->is_single_pass = 1;
+ session->min_qat_dev_gen = QAT_GEN3;
+ session->qat_cmd = ICP_QAT_FW_LA_CMD_CIPHER;
+ if (aead_xform->algo == RTE_CRYPTO_AEAD_AES_GCM) {
session->qat_mode = ICP_QAT_HW_CIPHER_AEAD_MODE;
- session->cipher_iv.offset = aead_xform->iv.offset;
- session->cipher_iv.length = aead_xform->iv.length;
- if (qat_sym_session_aead_create_cd_cipher(session,
- aead_xform->key.data, aead_xform->key.length))
- return -EINVAL;
- session->aad_len = aead_xform->aad_length;
- session->digest_length = aead_xform->digest_length;
- if (aead_xform->op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
- session->qat_dir = ICP_QAT_HW_CIPHER_ENCRYPT;
- session->auth_op = ICP_QAT_HW_AUTH_GENERATE;
- ICP_QAT_FW_LA_RET_AUTH_SET(
- session->fw_req.comn_hdr.serv_specif_flags,
- ICP_QAT_FW_LA_RET_AUTH_RES);
- } else {
- session->qat_dir = ICP_QAT_HW_CIPHER_DECRYPT;
- session->auth_op = ICP_QAT_HW_AUTH_VERIFY;
- ICP_QAT_FW_LA_CMP_AUTH_SET(
- session->fw_req.comn_hdr.serv_specif_flags,
- ICP_QAT_FW_LA_CMP_AUTH_RES);
- }
- ICP_QAT_FW_LA_SINGLE_PASS_PROTO_FLAG_SET(
- session->fw_req.comn_hdr.serv_specif_flags,
- ICP_QAT_FW_LA_SINGLE_PASS_PROTO);
- ICP_QAT_FW_LA_PROTO_SET(
- session->fw_req.comn_hdr.serv_specif_flags,
- ICP_QAT_FW_LA_NO_PROTO);
ICP_QAT_FW_LA_GCM_IV_LEN_FLAG_SET(
- session->fw_req.comn_hdr.serv_specif_flags,
- ICP_QAT_FW_LA_GCM_IV_LEN_12_OCTETS);
- session->fw_req.comn_hdr.service_cmd_id =
- ICP_QAT_FW_LA_CMD_CIPHER;
- session->cd.cipher.cipher_config.val =
- ICP_QAT_HW_CIPHER_CONFIG_BUILD(
- ICP_QAT_HW_CIPHER_AEAD_MODE,
- session->qat_cipher_alg,
- ICP_QAT_HW_CIPHER_NO_CONVERT,
- session->qat_dir);
- QAT_FIELD_SET(session->cd.cipher.cipher_config.val,
- aead_xform->digest_length,
- QAT_CIPHER_AEAD_HASH_CMP_LEN_BITPOS,
- QAT_CIPHER_AEAD_HASH_CMP_LEN_MASK);
- session->cd.cipher.cipher_config.reserved =
- ICP_QAT_HW_CIPHER_CONFIG_BUILD_UPPER(
- aead_xform->aad_length);
- cipher_param->spc_aad_sz = aead_xform->aad_length;
- cipher_param->spc_auth_res_sz = aead_xform->digest_length;
+ session->fw_req.comn_hdr.serv_specif_flags,
+ ICP_QAT_FW_LA_GCM_IV_LEN_12_OCTETS);
+ } else {
+ /* Chacha-Poly is special case that use QAT CTR mode */
+ session->qat_mode = ICP_QAT_HW_CIPHER_CTR_MODE;
+ }
+ session->cipher_iv.offset = aead_xform->iv.offset;
+ session->cipher_iv.length = aead_xform->iv.length;
+ if (qat_sym_session_aead_create_cd_cipher(session,
+ aead_xform->key.data, aead_xform->key.length))
+ return -EINVAL;
+ session->aad_len = aead_xform->aad_length;
+ session->digest_length = aead_xform->digest_length;
+ if (aead_xform->op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
+ session->qat_dir = ICP_QAT_HW_CIPHER_ENCRYPT;
+ session->auth_op = ICP_QAT_HW_AUTH_GENERATE;
+ ICP_QAT_FW_LA_RET_AUTH_SET(
+ session->fw_req.comn_hdr.serv_specif_flags,
+ ICP_QAT_FW_LA_RET_AUTH_RES);
+ } else {
+ session->qat_dir = ICP_QAT_HW_CIPHER_DECRYPT;
+ session->auth_op = ICP_QAT_HW_AUTH_VERIFY;
+ ICP_QAT_FW_LA_CMP_AUTH_SET(
+ session->fw_req.comn_hdr.serv_specif_flags,
+ ICP_QAT_FW_LA_CMP_AUTH_RES);
}
+ ICP_QAT_FW_LA_SINGLE_PASS_PROTO_FLAG_SET(
+ session->fw_req.comn_hdr.serv_specif_flags,
+ ICP_QAT_FW_LA_SINGLE_PASS_PROTO);
+ ICP_QAT_FW_LA_PROTO_SET(
+ session->fw_req.comn_hdr.serv_specif_flags,
+ ICP_QAT_FW_LA_NO_PROTO);
+ session->fw_req.comn_hdr.service_cmd_id =
+ ICP_QAT_FW_LA_CMD_CIPHER;
+ session->cd.cipher.cipher_config.val =
+ ICP_QAT_HW_CIPHER_CONFIG_BUILD(
+ ICP_QAT_HW_CIPHER_AEAD_MODE,
+ session->qat_cipher_alg,
+ ICP_QAT_HW_CIPHER_NO_CONVERT,
+ session->qat_dir);
+ QAT_FIELD_SET(session->cd.cipher.cipher_config.val,
+ aead_xform->digest_length,
+ QAT_CIPHER_AEAD_HASH_CMP_LEN_BITPOS,
+ QAT_CIPHER_AEAD_HASH_CMP_LEN_MASK);
+ session->cd.cipher.cipher_config.reserved =
+ ICP_QAT_HW_CIPHER_CONFIG_BUILD_UPPER(
+ aead_xform->aad_length);
+ cipher_param->spc_aad_sz = aead_xform->aad_length;
+ cipher_param->spc_auth_res_sz = aead_xform->digest_length;
+
return 0;
}
@@ -854,6 +853,10 @@ qat_sym_session_configure_aead(struct rte_cryptodev *dev,
{
struct rte_crypto_aead_xform *aead_xform = &xform->aead;
enum rte_crypto_auth_operation crypto_operation;
+ struct qat_sym_dev_private *internals =
+ dev->data->dev_private;
+ enum qat_device_gen qat_dev_gen =
+ internals->qat_dev->qat_dev_gen;
/*
* Store AEAD IV parameters as cipher IV,
@@ -864,6 +867,7 @@ qat_sym_session_configure_aead(struct rte_cryptodev *dev,
session->auth_mode = ICP_QAT_HW_AUTH_MODE1;
+ session->is_single_pass = 0;
switch (aead_xform->algo) {
case RTE_CRYPTO_AEAD_AES_GCM:
if (qat_sym_validate_aes_key(aead_xform->key.length,
@@ -873,6 +877,11 @@ qat_sym_session_configure_aead(struct rte_cryptodev *dev,
}
session->qat_mode = ICP_QAT_HW_CIPHER_CTR_MODE;
session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_GALOIS_128;
+ if (qat_dev_gen > QAT_GEN2 && aead_xform->iv.length ==
+ QAT_AES_GCM_SPC_IV_SIZE) {
+ return qat_sym_session_handle_single_pass(session,
+ aead_xform);
+ }
if (session->cipher_iv.length == 0)
session->cipher_iv.length = AES_GCM_J0_LEN;
@@ -886,23 +895,19 @@ qat_sym_session_configure_aead(struct rte_cryptodev *dev,
session->qat_mode = ICP_QAT_HW_CIPHER_CTR_MODE;
session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_AES_CBC_MAC;
break;
+ case RTE_CRYPTO_AEAD_CHACHA20_POLY1305:
+ if (aead_xform->key.length != ICP_QAT_HW_CHACHAPOLY_KEY_SZ)
+ return -EINVAL;
+ session->qat_cipher_alg =
+ ICP_QAT_HW_CIPHER_ALGO_CHACHA20_POLY1305;
+ return qat_sym_session_handle_single_pass(session,
+ aead_xform);
default:
QAT_LOG(ERR, "Crypto: Undefined AEAD specified %u\n",
aead_xform->algo);
return -EINVAL;
}
- session->is_single_pass = 0;
- if (aead_xform->algo == RTE_CRYPTO_AEAD_AES_GCM) {
- /* Use faster Single-Pass GCM if possible */
- int res = qat_sym_session_handle_single_pass(
- dev->data->dev_private, session, aead_xform);
- if (res < 0)
- return res;
- if (session->is_single_pass)
- return 0;
- }
-
if ((aead_xform->op == RTE_CRYPTO_AEAD_OP_ENCRYPT &&
aead_xform->algo == RTE_CRYPTO_AEAD_AES_GCM) ||
(aead_xform->op == RTE_CRYPTO_AEAD_OP_DECRYPT &&
--
2.1.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test cases to cryptodev
2020-06-10 19:18 [dpdk-dev] [PATCH v4 1/2] crypto/qat: add chacha poly implementation Arek Kusztal
@ 2020-06-10 19:18 ` Arek Kusztal
2020-06-11 15:06 ` Anoob Joseph
0 siblings, 1 reply; 4+ messages in thread
From: Arek Kusztal @ 2020-06-10 19:18 UTC (permalink / raw)
To: dev; +Cc: akhil.goyal, fiona.trahe, Arek Kusztal
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,
+ 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test cases to cryptodev
2020-06-10 19:18 ` [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test cases to cryptodev Arek Kusztal
@ 2020-06-11 15:06 ` Anoob Joseph
2020-06-17 10:16 ` Tejasree Kondoj
0 siblings, 1 reply; 4+ messages in thread
From: Anoob Joseph @ 2020-06-11 15:06 UTC (permalink / raw)
To: Arek Kusztal, dev; +Cc: akhil.goyal, fiona.trahe
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test cases to cryptodev
2020-06-11 15:06 ` Anoob Joseph
@ 2020-06-17 10:16 ` Tejasree Kondoj
0 siblings, 0 replies; 4+ messages in thread
From: Tejasree Kondoj @ 2020-06-17 10:16 UTC (permalink / raw)
To: Anoob Joseph, Arek Kusztal, dev; +Cc: akhil.goyal, fiona.trahe
Acked-by: Tejasree Kondoj <ktejasree@marvell.com>
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Anoob Joseph
> Sent: Thursday, June 11, 2020 8:37 PM
> To: Arek Kusztal <arkadiuszx.kusztal@intel.com>; dev@dpdk.org
> Cc: akhil.goyal@nxp.com; fiona.trahe@intel.com
> Subject: Re: [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test
> cases to cryptodev
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-17 10:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-10 19:18 [dpdk-dev] [PATCH v4 1/2] crypto/qat: add chacha poly implementation Arek Kusztal
2020-06-10 19:18 ` [dpdk-dev] [PATCH v4 2/2] test/cryptodev: add chacha poly test cases to cryptodev Arek Kusztal
2020-06-11 15:06 ` Anoob Joseph
2020-06-17 10:16 ` Tejasree Kondoj
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).