[dpdk-dev,3/3] qat: fixes premature addition of AES_CMAC in session creation

Message ID 1457454137-22315-4-git-send-email-john.griffin@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Griffin, John March 8, 2016, 4:22 p.m. UTC
  Remove support for AES CMAC support for which was added to
the code in error.  AES CMAC will be added in a subsequent release
when testing completes.

Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices")

Signed-off-by: John Griffin <john.griffin@intel.com>
---
 drivers/crypto/qat/qat_crypto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Thomas Monjalon March 11, 2016, 12:16 a.m. UTC | #1
2016-03-08 16:22, John Griffin:
> Remove support for AES CMAC support for which was added to
> the code in error.  AES CMAC will be added in a subsequent release
> when testing completes.
[...]
>  	case RTE_CRYPTO_AUTH_AES_GCM:
> -	case RTE_CRYPTO_AUTH_AES_GMAC:

CMAC or GMAC?

>  		session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_GALOIS_128;
>  		break;
>  	case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
> @@ -312,6 +311,7 @@ qat_crypto_sym_configure_session_auth(struct rte_cryptodev *dev,
>  	case RTE_CRYPTO_AUTH_MD5:
>  	case RTE_CRYPTO_AUTH_MD5_HMAC:
>  	case RTE_CRYPTO_AUTH_AES_CCM:
> +	case RTE_CRYPTO_AUTH_AES_GMAC:

So it is added? What should we have later?
  
De Lara Guarch, Pablo March 11, 2016, 12:24 a.m. UTC | #2
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Friday, March 11, 2016 12:17 AM
> To: Griffin, John
> Cc: dev@dpdk.org; De Lara Guarch, Pablo
> Subject: Re: [dpdk-dev] [PATCH 3/3] qat: fixes premature addition of
> AES_CMAC in session creation
> 
> 2016-03-08 16:22, John Griffin:
> > Remove support for AES CMAC support for which was added to
> > the code in error.  AES CMAC will be added in a subsequent release
> > when testing completes.
> [...]
> >  	case RTE_CRYPTO_AUTH_AES_GCM:
> > -	case RTE_CRYPTO_AUTH_AES_GMAC:
> 
> CMAC or GMAC?

It is AES_GMAC, I commented that title was wrong.

> 
> >  		session->qat_hash_alg =
> ICP_QAT_HW_AUTH_ALGO_GALOIS_128;
> >  		break;
> >  	case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
> > @@ -312,6 +311,7 @@ qat_crypto_sym_configure_session_auth(struct
> rte_cryptodev *dev,
> >  	case RTE_CRYPTO_AUTH_MD5:
> >  	case RTE_CRYPTO_AUTH_MD5_HMAC:
> >  	case RTE_CRYPTO_AUTH_AES_CCM:
> > +	case RTE_CRYPTO_AUTH_AES_GMAC:
> 
> So it is added? What should we have later?
  
Griffin, John March 11, 2016, 11:01 a.m. UTC | #3
On 11/03/16 00:16, Thomas Monjalon wrote:
> 2016-03-08 16:22, John Griffin:
>> Remove support for AES CMAC support for which was added to
>> the code in error.  AES CMAC will be added in a subsequent release
>> when testing completes.
> [...]
>>   	case RTE_CRYPTO_AUTH_AES_GCM:
>> -	case RTE_CRYPTO_AUTH_AES_GMAC:
>
> CMAC or GMAC?

Yes GMAC - thanks Pablo and Thomas.
  

Patch

diff --git a/drivers/crypto/qat/qat_crypto.c b/drivers/crypto/qat/qat_crypto.c
index 48e810f..366a064 100644
--- a/drivers/crypto/qat/qat_crypto.c
+++ b/drivers/crypto/qat/qat_crypto.c
@@ -295,7 +295,6 @@  qat_crypto_sym_configure_session_auth(struct rte_cryptodev *dev,
 		session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_AES_XCBC_MAC;
 		break;
 	case RTE_CRYPTO_AUTH_AES_GCM:
-	case RTE_CRYPTO_AUTH_AES_GMAC:
 		session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_GALOIS_128;
 		break;
 	case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
@@ -312,6 +311,7 @@  qat_crypto_sym_configure_session_auth(struct rte_cryptodev *dev,
 	case RTE_CRYPTO_AUTH_MD5:
 	case RTE_CRYPTO_AUTH_MD5_HMAC:
 	case RTE_CRYPTO_AUTH_AES_CCM:
+	case RTE_CRYPTO_AUTH_AES_GMAC:
 	case RTE_CRYPTO_AUTH_KASUMI_F9:
 	case RTE_CRYPTO_AUTH_AES_CMAC:
 	case RTE_CRYPTO_AUTH_AES_CBC_MAC: