[dpdk-stable] patch 'cryptodev: fix SHA-1 digest enum comment' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/29/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 1df20ac457413526f21d9f715135964de69c705b Mon Sep 17 00:00:00 2001
From: Adam Dybkowski <adamx.dybkowski at intel.com>
Date: Thu, 21 May 2020 16:48:53 +0200
Subject: [PATCH] cryptodev: fix SHA-1 digest enum comment

[ upstream commit e475fd853ac1cae9cf837a10e8c386503175752e ]

This patch fixes improper SHA-1 digest size in the enum comment
and also adds the note about HMAC-SHA-1-96.

Fixes: 1bd407fac80b ("cryptodev: extract symmetric operations")

Signed-off-by: Adam Dybkowski <adamx.dybkowski at intel.com>
Acked-by: Fiona Trahe <fiona.trahe at intel.com>
Acked-by: Anoob Joseph <anoobj at marvell.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 lib/librte_cryptodev/rte_crypto_sym.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/librte_cryptodev/rte_crypto_sym.h b/lib/librte_cryptodev/rte_crypto_sym.h
index ffa038dc40..4e05c7c6ac 100644
--- a/lib/librte_cryptodev/rte_crypto_sym.h
+++ b/lib/librte_cryptodev/rte_crypto_sym.h
@@ -208,9 +208,12 @@ enum rte_crypto_auth_algorithm {
 	/**< HMAC using MD5 algorithm */
 
 	RTE_CRYPTO_AUTH_SHA1,
-	/**< 128 bit SHA algorithm. */
+	/**< 160 bit SHA algorithm. */
 	RTE_CRYPTO_AUTH_SHA1_HMAC,
-	/**< HMAC using 128 bit SHA algorithm. */
+	/**< HMAC using 160 bit SHA algorithm.
+	 * HMAC-SHA-1-96 can be generated by setting
+	 * digest_length to 12 bytes in auth/aead xforms.
+	 */
 	RTE_CRYPTO_AUTH_SHA224,
 	/**< 224 bit SHA algorithm. */
 	RTE_CRYPTO_AUTH_SHA224_HMAC,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-27 10:23:31.822513382 +0100
+++ 0005-cryptodev-fix-SHA-1-digest-enum-comment.patch	2020-05-27 10:23:31.627933720 +0100
@@ -1,13 +1,14 @@
-From e475fd853ac1cae9cf837a10e8c386503175752e Mon Sep 17 00:00:00 2001
+From 1df20ac457413526f21d9f715135964de69c705b Mon Sep 17 00:00:00 2001
 From: Adam Dybkowski <adamx.dybkowski at intel.com>
 Date: Thu, 21 May 2020 16:48:53 +0200
 Subject: [PATCH] cryptodev: fix SHA-1 digest enum comment
 
+[ upstream commit e475fd853ac1cae9cf837a10e8c386503175752e ]
+
 This patch fixes improper SHA-1 digest size in the enum comment
 and also adds the note about HMAC-SHA-1-96.
 
 Fixes: 1bd407fac80b ("cryptodev: extract symmetric operations")
-Cc: stable at dpdk.org
 
 Signed-off-by: Adam Dybkowski <adamx.dybkowski at intel.com>
 Acked-by: Fiona Trahe <fiona.trahe at intel.com>
@@ -18,10 +19,10 @@
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/lib/librte_cryptodev/rte_crypto_sym.h b/lib/librte_cryptodev/rte_crypto_sym.h
-index d9585ecd69..da961a19d2 100644
+index ffa038dc40..4e05c7c6ac 100644
 --- a/lib/librte_cryptodev/rte_crypto_sym.h
 +++ b/lib/librte_cryptodev/rte_crypto_sym.h
-@@ -269,9 +269,12 @@ enum rte_crypto_auth_algorithm {
+@@ -208,9 +208,12 @@ enum rte_crypto_auth_algorithm {
  	/**< HMAC using MD5 algorithm */
  
  	RTE_CRYPTO_AUTH_SHA1,