From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AB8CCA034D for ; Mon, 14 Mar 2022 12:06:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A01AA40DDD; Mon, 14 Mar 2022 12:06:13 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 1E363410E7 for ; Mon, 14 Mar 2022 12:06:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647255972; x=1678791972; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aPzA07WHofFHtKKKKDvKdH0Rug/kUEBVqclMm3Jg9RU=; b=TMB00UB7TisoOrIOTO+D4qppDK9zzAQSjLsa4+8ggDkj6xk645u12b56 Qa3c9sfXTjzpDoWKHT/Zf+nAGylu0fv7f5rslf/PmQhz3uPectBB7Gbx4 3F/ADKX1Do+SDzQ0/fg+jTCg49MepyvKM/RXBaGUefLOTG9C4zlbO2up2 ArH+v6VfuilgIwmgDq4z1B+qiT+LbHcUPoB1r6emTBhjU4IHlezAwfqj6 xTmTS0myNMMTo/LjmDKdBhglxpBmqlUuDSJ7rZXtY58nN5gpXURuBLXu6 254gL74KE/WSKKPrGrxsCwoiZ7+qzg8HOgtuVstyc6Lj891ueb5wRbRY9 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="319220397" X-IronPort-AV: E=Sophos;i="5.90,180,1643702400"; d="scan'208";a="319220397" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2022 04:06:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,180,1643702400"; d="scan'208";a="515381129" Received: from silpixa00400636.ir.intel.com ([10.237.213.19]) by orsmga006.jf.intel.com with ESMTP; 14 Mar 2022 04:06:05 -0700 From: Pablo de Lara To: luca.boccassi@gmail.com, stable@dpdk.org Cc: Pablo de Lara , Fan Zhang , Radu Nicolau Subject: [PATCH 20.11 2/2] crypto/ipsec_mb: fix GMAC parameters setting Date: Mon, 14 Mar 2022 11:05:59 +0000 Message-Id: <20220314110559.1502861-2-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220314110559.1502861-1-pablo.de.lara.guarch@intel.com> References: <20220314110559.1502861-1-pablo.de.lara.guarch@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit 837269c2e5c5a8813adfcf59f23b80569048ddeb ] AES-GMAC requires plaintext length to be 0 when using AES-GCM, so only AAD data is used. Fixes: a501609ea646 ("crypto/ipsec_mb: fix length and offset settings") Cc: pablo.de.lara.guarch@intel.com Cc: stable@dpdk.org Signed-off-by: Pablo de Lara Acked-by: Fan Zhang Acked-by: Radu Nicolau Tested-by: Radu Nicolau --- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index 07f5caa76f..ce23a9a332 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -1437,9 +1437,9 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp, op->sym->aead.data.offset; job->msg_len_to_hash_in_bytes = op->sym->aead.data.length; - } else { - job->msg_len_to_cipher_in_bytes = 0; + } else { /* AES-GMAC only, only AAD used */ job->msg_len_to_hash_in_bytes = 0; + job->hash_start_src_offset_in_bytes = 0; } job->iv = rte_crypto_op_ctod_offset(op, uint8_t *, @@ -1523,8 +1523,19 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp, op->sym->cipher.data.length; break; #endif - case IMB_CIPHER_CCM: case IMB_CIPHER_GCM: + if (session->cipher.mode == IMB_CIPHER_NULL) { + /* AES-GMAC only (only AAD used) */ + job->msg_len_to_cipher_in_bytes = 0; + job->cipher_start_src_offset_in_bytes = 0; + } else { + job->cipher_start_src_offset_in_bytes = + op->sym->aead.data.offset; + job->msg_len_to_cipher_in_bytes = + op->sym->aead.data.length; + } + break; + case IMB_CIPHER_CCM: case IMB_CIPHER_CHACHA20_POLY1305: job->cipher_start_src_offset_in_bytes = op->sym->aead.data.offset; -- 2.25.1