patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] crypto/qat: fix not included algs for zero counter
@ 2019-09-26  8:06 Arek Kusztal
  2019-09-26  8:18 ` Luca Boccassi
  0 siblings, 1 reply; 2+ messages in thread
From: Arek Kusztal @ 2019-09-26  8:06 UTC (permalink / raw)
  To: stable; +Cc: fiona.trahe, bluca, ferruh.yigit, Arek Kusztal

Algorithms NULL, XCBC, CBC-MAC should have had zeroed counter.

Fixes: e25200fbb45d ("qat: add cipher/auth only")

Signed-off-by: Arek Kusztal <arkadiuszx.kusztal@intel.com>
---
This patch obsoletes patches:
http://patches.dpdk.org/patch/48715/
http://patches.dpdk.org/patch/48716/

 drivers/crypto/qat/qat_adf/qat_algs_build_desc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 b939381..192925e 100644
--- a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
+++ b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
@@ -751,7 +751,10 @@ int qat_alg_aead_session_create_content_desc_auth(struct qat_session *cdesc,
 
 	if (cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_SNOW_3G_UIA2
 		|| cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_KASUMI_F9
-		|| cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_ZUC_3G_128_EIA3)
+		|| cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_ZUC_3G_128_EIA3
+		|| cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_AES_XCBC_MAC
+		|| cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_AES_CBC_MAC
+		|| cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL)
 		hash->auth_counter.counter = 0;
 	else {
 		int block_size = qat_hash_get_block_size(cdesc->qat_hash_alg);
-- 
2.1.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [PATCH] crypto/qat: fix not included algs for zero counter
  2019-09-26  8:06 [dpdk-stable] [PATCH] crypto/qat: fix not included algs for zero counter Arek Kusztal
@ 2019-09-26  8:18 ` Luca Boccassi
  0 siblings, 0 replies; 2+ messages in thread
From: Luca Boccassi @ 2019-09-26  8:18 UTC (permalink / raw)
  To: Arek Kusztal, stable; +Cc: fiona.trahe, ferruh.yigit

On Thu, 2019-09-26 at 10:06 +0200, Arek Kusztal wrote:
> Algorithms NULL, XCBC, CBC-MAC should have had zeroed counter.
> 
> Fixes: e25200fbb45d ("qat: add cipher/auth only")
> 
> Signed-off-by: Arek Kusztal <
> arkadiuszx.kusztal@intel.com
> >
> ---
> This patch obsoletes patches:
> http://patches.dpdk.org/patch/48715/
> 
> http://patches.dpdk.org/patch/48716/
> 
> 
>  drivers/crypto/qat/qat_adf/qat_algs_build_desc.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> 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 b939381..192925e 100644
> --- a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> +++ b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> @@ -751,7 +751,10 @@ int
> qat_alg_aead_session_create_content_desc_auth(struct qat_session
> *cdesc,
>  
>  	if (cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_SNOW_3G_UIA2
>  		|| cdesc->qat_hash_alg ==
> ICP_QAT_HW_AUTH_ALGO_KASUMI_F9
> -		|| cdesc->qat_hash_alg ==
> ICP_QAT_HW_AUTH_ALGO_ZUC_3G_128_EIA3)
> +		|| cdesc->qat_hash_alg ==
> ICP_QAT_HW_AUTH_ALGO_ZUC_3G_128_EIA3
> +		|| cdesc->qat_hash_alg ==
> ICP_QAT_HW_AUTH_ALGO_AES_XCBC_MAC
> +		|| cdesc->qat_hash_alg ==
> ICP_QAT_HW_AUTH_ALGO_AES_CBC_MAC
> +		|| cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL)
>  		hash->auth_counter.counter = 0;
>  	else {
>  		int block_size = qat_hash_get_block_size(cdesc-
> >qat_hash_alg);

Acked-by: Luca Boccassi <bluca@debian.org>

-- 
Kind regards,
Luca Boccassi

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-09-26  8:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-26  8:06 [dpdk-stable] [PATCH] crypto/qat: fix not included algs for zero counter Arek Kusztal
2019-09-26  8:18 ` Luca Boccassi

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).