From: Hemant Agrawal Date: Thu, 25 Jan 2018 09:53:29 +0000 (+0530) Subject: crypto/dpaa2_sec: fix enum conversion for GCM X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=681271e85809f2c0c8c0b81433ec00c832661d15;p=dpdk.git crypto/dpaa2_sec: fix enum conversion for GCM dpaa2_sec/dpaa2_sec_dpseci.c:1287:25: error: implicit conversion from enumeration type 'enum rte_crypto_aead_algorithm' to different enumeration type 'enum rte_crypto_cipher_algorithm' [-Werror,-Wenum-conversion] session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM; Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 200a9f369c..9a790dddde 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1795,7 +1795,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev, case RTE_CRYPTO_AEAD_AES_GCM: aeaddata.algtype = OP_ALG_ALGSEL_AES; aeaddata.algmode = OP_ALG_AAI_GCM; - session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM; + session->aead_alg = RTE_CRYPTO_AEAD_AES_GCM; break; case RTE_CRYPTO_AEAD_AES_CCM: RTE_LOG(ERR, PMD, "Crypto: Unsupported AEAD alg %u\n", diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h index c76b082339..e8ac95bacf 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h @@ -143,6 +143,7 @@ typedef struct dpaa2_sec_session_entry { uint8_t dir; /*!< Operation Direction */ enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/ enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/ + enum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/ union { struct { uint8_t *data; /**< pointer to key data */