crypto/openssl: support truncated HMAC operations

Message ID 20180728200052.18584-1-dmitry.ereminsolenikov@linaro.org
State Accepted
Commit c3d22a6522fa5801c906d2233c91d201c1af8fd1
Headers show
Series
  • crypto/openssl: support truncated HMAC operations
Related show

Commit Message

Dmitry Eremin-Solenikov July 28, 2018, 8 p.m.
IPsec requires truncated HMAC operations support. Extend OpenSSL crypto
PMD to support truncated HMAC operations necessary for IPsec.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
 drivers/crypto/openssl/rte_openssl_pmd.c     | 19 ++++++++++---------
 drivers/crypto/openssl/rte_openssl_pmd_ops.c | 16 ++++++++--------
 2 files changed, 18 insertions(+), 17 deletions(-)

-- 
2.18.0

Comments

De Lara Guarch, Pablo Aug. 1, 2018, 4:19 p.m. | #1
Hi Dmitry,

> -----Original Message-----

> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Dmitry Eremin-

> Solenikov

> Sent: Saturday, July 28, 2018 9:01 PM

> To: dev@dpdk.org

> Subject: [dpdk-dev] [PATCH] crypto/openssl: support truncated HMAC

> operations

> 

> IPsec requires truncated HMAC operations support. Extend OpenSSL crypto PMD

> to support truncated HMAC operations necessary for IPsec.

> 

> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


I am deferring this patch for next release, as only doc patches and fixes are allowed at this stage.
Also, I think we can extend this to other digest sizes (from 1 to maximum tag size).

Thanks,
Pablo

Patch

diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c
index 7d263aba3bbd..c635f1e2493c 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -1509,15 +1509,7 @@  process_openssl_auth_op(struct openssl_qp *qp, struct rte_crypto_op *op,
 
 	srclen = op->sym->auth.data.length;
 
-	if (sess->auth.operation == RTE_CRYPTO_AUTH_OP_VERIFY)
-		dst = qp->temp_digest;
-	else {
-		dst = op->sym->auth.digest.data;
-		if (dst == NULL)
-			dst = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
-					op->sym->auth.data.offset +
-					op->sym->auth.data.length);
-	}
+	dst = qp->temp_digest;
 
 	switch (sess->auth.mode) {
 	case OPENSSL_AUTH_AS_AUTH:
@@ -1540,6 +1532,15 @@  process_openssl_auth_op(struct openssl_qp *qp, struct rte_crypto_op *op,
 				sess->auth.digest_length) != 0) {
 			op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
 		}
+	} else {
+		uint8_t *auth_dst;
+
+		auth_dst = op->sym->auth.digest.data;
+		if (auth_dst == NULL)
+			auth_dst = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
+					op->sym->auth.data.offset +
+					op->sym->auth.data.length);
+		memcpy(auth_dst, dst, sess->auth.digest_length);
 	}
 
 	if (status != 0)
diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index de2284390b12..98e00e3cd9e4 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -26,9 +26,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 16,
+					.min = 12,
 					.max = 16,
-					.increment = 0
+					.increment = 4
 				},
 				.iv_size = { 0 }
 			}, }
@@ -68,9 +68,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 20,
+					.min = 12,
 					.max = 20,
-					.increment = 0
+					.increment = 8
 				},
 				.iv_size = { 0 }
 			}, }
@@ -152,9 +152,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 32,
+					.min = 16,
 					.max = 32,
-					.increment = 0
+					.increment = 16
 				},
 				.iv_size = { 0 }
 			}, }
@@ -236,9 +236,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 64,
+					.min = 32,
 					.max = 64,
-					.increment = 0
+					.increment = 32
 				},
 				.iv_size = { 0 }
 			}, }