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 228CD43E00 for ; Fri, 5 Apr 2024 12:40:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3AC3402D4; Fri, 5 Apr 2024 12:39:59 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by mails.dpdk.org (Postfix) with ESMTP id 19F22402CE for ; Fri, 5 Apr 2024 12:39:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712313598; x=1743849598; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=1c1N8HWd+xgRecPQX3Q3qSfOqWY3Hjr3lqvz6Kfjsrs=; b=MzdjMLEH1tMvna1Lh6y1kT8KymOYKzaK6K2r/FC0npJkjWGQ9xhpqiKy dCWM4kKFXnIx/jFd5wpfxmYRDEDawpQrYL7QqvZ2dc+TV6sgJpT5KMOSR 3gvp89aYb8S2QTA4PytCHu7P5i1vcKHZlQlJL0zXF1v/lQ5FJjCiuMxhY mv+yhuWzA5CE8J+B4K4jBbSOIiELU6yjl+QwcUEStxITjjnLwt+E/UJ6v YEtXIicLVJsaOuc6RJ1RBjQ2e4ARtrGcJ214UrEnYHC5ZcQGJHNqzMjKB qf4hNqmgvg7mWz1Zp7SN3myJj5f/p7g+L2Kcg/41nvONPAnTJYhV5Xykg Q==; X-CSE-ConnectionGUID: hpPem0QATZSGL6v+xiM+3Q== X-CSE-MsgGUID: +aVuQI2eQnmXQHcnUqcHRA== X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="7496469" X-IronPort-AV: E=Sophos;i="6.07,181,1708416000"; d="scan'208";a="7496469" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2024 03:39:57 -0700 X-CSE-ConnectionGUID: 6bOT6LMvTMC5KkQ/Qcgy/A== X-CSE-MsgGUID: +KSJ4N+MQC2RLaWQkMzDqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,181,1708416000"; d="scan'208";a="23838769" Received: from silpixa00401797.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.113]) by orviesa004.jf.intel.com with ESMTP; 05 Apr 2024 03:39:53 -0700 From: Ciara Power To: stable@dpdk.org Cc: Ciara Power , pablo.de.lara.guarch@intel.com, Fan Zhang Subject: [PATCH 21.11] crypto/ipsec_mb: fix incorrectly setting cipher keys Date: Fri, 5 Apr 2024 10:39:46 +0000 Message-Id: <20240405103946.2787713-1-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 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 The encryption and decryption keys were incorrectly being reset based on authentication algorithm after already being set earlier in the code based on cipher algorithm. In cases when 3DES was used, the keys were being incorrectly overwritten. For CPU path, there is no need to have the keys set for XCBC and CMAC cases. Fixes: 010230a1543b ("crypto/aesni_mb: support Chacha20-Poly1305") Fixes: b0a37e8cd2ac ("crypto/ipsec_mb: fix cipher key setting") Fixes: a2c6d3f34f90 ("crypto/aesni_mb: support CPU crypto") Signed-off-by: Ciara Power --- Cc: pablo.de.lara.guarch@intel.com --- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 536a586e98..1097244bab 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -992,9 +992,6 @@ set_cpu_mb_job_params(IMB_JOB *job, struct aesni_mb_session *session, job->u.XCBC._k1_expanded = session->auth.xcbc.k1_expanded; job->u.XCBC._k2 = session->auth.xcbc.k2; job->u.XCBC._k3 = session->auth.xcbc.k3; - - job->enc_keys = session->cipher.expanded_aes_keys.encode; - job->dec_keys = session->cipher.expanded_aes_keys.decode; break; case IMB_AUTH_AES_CCM: @@ -1009,8 +1006,6 @@ set_cpu_mb_job_params(IMB_JOB *job, struct aesni_mb_session *session, job->u.CMAC._key_expanded = session->auth.cmac.expkey; job->u.CMAC._skey1 = session->auth.cmac.skey1; job->u.CMAC._skey2 = session->auth.cmac.skey2; - job->enc_keys = session->cipher.expanded_aes_keys.encode; - job->dec_keys = session->cipher.expanded_aes_keys.decode; break; case IMB_AUTH_AES_GMAC: @@ -1139,24 +1134,17 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp, job->u.XCBC._k1_expanded = session->auth.xcbc.k1_expanded; job->u.XCBC._k2 = session->auth.xcbc.k2; job->u.XCBC._k3 = session->auth.xcbc.k3; - - job->enc_keys = session->cipher.expanded_aes_keys.encode; - job->dec_keys = session->cipher.expanded_aes_keys.decode; break; case IMB_AUTH_AES_CCM: job->u.CCM.aad = op->sym->aead.aad.data + 18; job->u.CCM.aad_len_in_bytes = session->aead.aad_len; - job->enc_keys = session->cipher.expanded_aes_keys.encode; - job->dec_keys = session->cipher.expanded_aes_keys.decode; break; case IMB_AUTH_AES_CMAC: job->u.CMAC._key_expanded = session->auth.cmac.expkey; job->u.CMAC._skey1 = session->auth.cmac.skey1; job->u.CMAC._skey2 = session->auth.cmac.skey2; - job->enc_keys = session->cipher.expanded_aes_keys.encode; - job->dec_keys = session->cipher.expanded_aes_keys.decode; break; case IMB_AUTH_AES_GMAC: @@ -1194,8 +1182,6 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp, job->u.CHACHA20_POLY1305.aad = op->sym->aead.aad.data; job->u.CHACHA20_POLY1305.aad_len_in_bytes = session->aead.aad_len; - job->enc_keys = session->cipher.expanded_aes_keys.encode; - job->dec_keys = session->cipher.expanded_aes_keys.encode; break; default: job->u.HMAC._hashed_auth_key_xor_ipad = -- 2.25.1