diff mbox series

[v1] crypto/qat: add support for 8 byte 3DES

Message ID 20180612103946.34385-1-marko.kovacevic@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Pablo de Lara Guarch
Headers
Series [v1] crypto/qat: add support for 8 byte 3DES |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply issues

Commit Message

Kovacevic, Marko June 12, 2018, 10:39 a.m. UTC 
  Added extra case to support 8 byte key size
for 3DES CBC. Also changed capabilities to reflect
the change.

Signed-off-by: Marko, Kovacevic <marko.kovacevic@intel.com>
---
 drivers/crypto/qat/qat_adf/qat_algs.h            | 1 +
 drivers/crypto/qat/qat_adf/qat_algs_build_desc.c | 1 +
 drivers/crypto/qat/qat_crypto_capabilities.h     | 2 +-
 test/test/test_cryptodev_des_test_vectors.h      | 6 ++++--
 4 files changed, 7 insertions(+), 3 deletions(-)

Comments

Fiona Trahe June 13, 2018, 4:15 p.m. UTC | #1 
Hi Marko,

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Kovacevic, Marko
> Sent: Tuesday, June 12, 2018 11:40 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Jain, Deepak K
> <deepak.k.jain@intel.com>; Kovacevic, Marko <marko.kovacevic@intel.com>; Marko@dpdk.org
> Subject: [dpdk-dev] [PATCH v1] crypto/qat: add support for 8 byte 3DES
> 
> Added extra case to support 8 byte key size
> for 3DES CBC. Also changed capabilities to reflect
> the change.
> 
> Signed-off-by: Marko, Kovacevic <marko.kovacevic@intel.com>
> ---
>  drivers/crypto/qat/qat_adf/qat_algs.h            | 1 +
>  drivers/crypto/qat/qat_adf/qat_algs_build_desc.c | 1 +
>  drivers/crypto/qat/qat_crypto_capabilities.h     | 2 +-
>  test/test/test_cryptodev_des_test_vectors.h      | 6 ++++--
>  4 files changed, 7 insertions(+), 3 deletions(-)

This piece of QAT code should also be modified to copy K1 to K2 and K3:
if ((cdesc->qat_cipher_alg == ICP_QAT_HW_CIPHER_ALGO_3DES)
	&& (cipherkeylen == QAT_3DES_KEY_SZ_OPT2))
	/* K3 not provided so use K1 = K3*/
	memcpy(cdesc->cd_cur_ptr, cipherkey, padding_size);
else
	memset(cdesc->cd_cur_ptr, 0, padding_size);
	cdesc->cd_cur_ptr += padding_size;

I can see from the testcode added in the aesni_mb patch, that the test vector output
(ciphertext512_des) is the same as for plain DES. So as QAT would pad with 0s, this probably
explains why the tests are passing. But I can't see how the test can pass on aesni_mb
as K1 is being correctly copied there. I must be missing something?
diff mbox series

Patch

diff --git a/drivers/crypto/qat/qat_adf/qat_algs.h b/drivers/crypto/qat/qat_adf/qat_algs.h
index 88bd5f00e..a3a3545ef 100644
--- a/drivers/crypto/qat/qat_adf/qat_algs.h
+++ b/drivers/crypto/qat/qat_adf/qat_algs.h
@@ -21,6 +21,7 @@ 
 /* 3DES key sizes */
 #define QAT_3DES_KEY_SZ_OPT1 24 /* Keys are independent */
 #define QAT_3DES_KEY_SZ_OPT2 16 /* K3=K1 */
+#define QAT_3DES_KEY_SZ_OPT3 8 /* K1=K2=K3 */
 
 #define QAT_AES_HW_CONFIG_CBC_ENC(alg) \
 	ICP_QAT_HW_CIPHER_CONFIG_BUILD(ICP_QAT_HW_CIPHER_CBC_MODE, alg, \
diff --git a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
index c87ed40fe..e89858d22 100644
--- a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
+++ b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
@@ -994,6 +994,7 @@  int qat_alg_validate_3des_key(int key_len, enum icp_qat_hw_cipher_algo *alg)
 	switch (key_len) {
 	case QAT_3DES_KEY_SZ_OPT1:
 	case QAT_3DES_KEY_SZ_OPT2:
+	case QAT_3DES_KEY_SZ_OPT3:
 		*alg = ICP_QAT_HW_CIPHER_ALGO_3DES;
 		break;
 	default:
diff --git a/drivers/crypto/qat/qat_crypto_capabilities.h b/drivers/crypto/qat/qat_crypto_capabilities.h
index 001c32c5d..1d6110970 100644
--- a/drivers/crypto/qat/qat_crypto_capabilities.h
+++ b/drivers/crypto/qat/qat_crypto_capabilities.h
@@ -434,7 +434,7 @@ 
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,	\
 				.block_size = 8,			\
 				.key_size = {				\
-					.min = 16,			\
+					.min = 8,			\
 					.max = 24,			\
 					.increment = 8			\
 				},					\
diff --git a/test/test/test_cryptodev_des_test_vectors.h b/test/test/test_cryptodev_des_test_vectors.h
index 7479e70f0..103345605 100644
--- a/test/test/test_cryptodev_des_test_vectors.h
+++ b/test/test/test_cryptodev_des_test_vectors.h
@@ -1233,14 +1233,16 @@  static const struct blockcipher_test_case triple_des_cipheronly_test_cases[] = {
 		.test_data = &triple_des64cbc_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
 		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-			BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+			BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT
 	},
 	{
 		.test_descr = "3DES-64-CBC Decryption",
 		.test_data = &triple_des64cbc_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
 		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-			BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+			BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
+			BLOCKCIPHER_TEST_TARGET_PMD_QAT
 	},
 	{
 		.test_descr = "3DES-128-CBC Encryption",