diff mbox series

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

Message ID 20180612103925.34342-1-marko.kovacevic@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Pablo de Lara Guarch
Headers
Series [v1] crypto/openssl: 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/openssl/rte_openssl_pmd.c     | 3 +++
 drivers/crypto/openssl/rte_openssl_pmd_ops.c | 2 +-
 test/test/test_cryptodev_des_test_vectors.h  | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

Comments

De Lara Guarch, Pablo July 23, 2018, 8:50 a.m. UTC | #1 
> -----Original Message-----
> From: Kovacevic, Marko
> Sent: Tuesday, June 12, 2018 11:39 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
> Subject: [PATCH v1] crypto/openssl: 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>

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
De Lara Guarch, Pablo July 23, 2018, 8:56 a.m. UTC | #2 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of De Lara Guarch, Pablo
> Sent: Monday, July 23, 2018 9:50 AM
> To: Kovacevic, Marko <marko.kovacevic@intel.com>; dev@dpdk.org
> Cc: Jain, Deepak K <deepak.k.jain@intel.com>; Kovacevic, Marko
> <marko.kovacevic@intel.com>
> Subject: Re: [dpdk-dev] [PATCH v1] crypto/openssl: add support for 8 byte 3DES
> 
> 
> 
> > -----Original Message-----
> > From: Kovacevic, Marko
> > Sent: Tuesday, June 12, 2018 11:39 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
> > Subject: [PATCH v1] crypto/openssl: 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>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied to dpdk-next-crypto.
Thanks,

Pablo
diff mbox series

Patch

diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c
index 93c6d7e..a1b4ca4 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -137,6 +137,9 @@  get_cipher_algo(enum rte_crypto_cipher_algorithm sess_algo, size_t keylen,
 		switch (sess_algo) {
 		case RTE_CRYPTO_CIPHER_3DES_CBC:
 			switch (keylen) {
+			case 8:
+				*algo = EVP_des_cbc();
+				break;
 			case 16:
 				*algo = EVP_des_ede_cbc();
 				break;
diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index 1cb87d5..e7c5a57 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -397,7 +397,7 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.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 4217b72..7479e70 100644
--- a/test/test/test_cryptodev_des_test_vectors.h
+++ b/test/test/test_cryptodev_des_test_vectors.h
@@ -1232,13 +1232,15 @@  static const struct blockcipher_test_case triple_des_cipheronly_test_cases[] = {
 		.test_descr = "3DES-64-CBC Encryption",
 		.test_data = &triple_des64cbc_test_vector,
 		.op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
-		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
+			BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
 	},
 	{
 		.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
+		.pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
+			BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
 	},
 	{
 		.test_descr = "3DES-128-CBC Encryption",