diff mbox series

[17/40] crypto/openssl: move dh type from xform to dh op

Message ID	20220520055445.40063-18-arkadiuszx.kusztal@intel.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	akhil goyal
Headers	From: Arek Kusztal <arkadiuszx.kusztal@intel.com> To: dev@dpdk.org Cc: gakhil@marvell.com, anoobj@marvell.com, roy.fan.zhang@intel.com, Arek Kusztal <arkadiuszx.kusztal@intel.com> Subject: [PATCH 17/40] crypto/openssl: move dh type from xform to dh op Date: Fri, 20 May 2022 06:54:22 +0100 Message-Id: <20220520055445.40063-18-arkadiuszx.kusztal@intel.com> In-Reply-To: <20220520055445.40063-1-arkadiuszx.kusztal@intel.com> References: <20220520055445.40063-1-arkadiuszx.kusztal@intel.com> Precedence: list Errors-To: dev-bounces@dpdk.org
Series	cryptodev: rsa, dh, ecdh changes \| [00/40] cryptodev: rsa, dh, ecdh changes [01/40] cryptodev: redefine ec group enum [02/40] cryptodev: remove list end enumerators [03/40] test/crypto: remove list end enumerators [04/40] cryptodev: reduce number of comments in asym xform [05/40] test/crypto: removed asym xform none [06/40] cryptodev: separate key exchange operation enum [07/40] crypto/openssl: separate key exchange operation enum [08/40] test/crypto: separate key exchange operation enum [09/40] cryptodev: remove unnecessary zero assignement [10/40] cryptodev: remove comment about using ephemeral key in dsa [11/40] cryptodev: remove asym crypto next xform [12/40] crypto/openssl: remove asym crypto next xform [13/40] test/crypto: remove asym crypto next xform [14/40] app/test-crypto-perf: remove asym crypto next xform [15/40] app/test-eventdev: remove asym crypto next xform [16/40] cryptodev: move dh type from xform to dh op [17/40] crypto/openssl: move dh type from xform to dh op [18/40] test/crypto: move dh type from xform to dh op [19/40] cryptodev: changed order of dh fields [20/40] cryptodev: add elliptic curve diffie hellman [21/40] cryptodev: add public key verify option [22/40] cryptodev: move RSA padding into separate struct [23/40] crypto/qat: move RSA padding into separate struct [24/40] crypto/openssl: move RSA padding into separate struct [25/40] crypto/octeontx: move RSA padding into separate struct [26/40] crypto/cnxk: move RSA padding into separate struct [27/40] common/cpt: move RSA padding into separate struct [28/40] test/crypto: move RSA padding into separate struct [29/40] cryptodev: add salt length and optional label [30/40] cryptodev: reduce rsa struct to only necessary fields [31/40] crypto/qat: reduce rsa struct to only necessary fields [32/40] crypto/openssl: reduce rsa struct to only necessary fields [33/40] crypto/octeontx: reduce rsa struct to only necessary fields [34/40] crypto/cnxk: reduce rsa struct to only necessary fields [35/40] common/cpt: reduce rsa struct to only necessary fields [36/40] test/crypto: reduce rsa struct to only necessary fields [37/40] cryptodev: add asym op flags [38/40] cryptodev: clarify usage of private key in dh [39/40] crypto/openssl: generate dh private key [40/40] test/crypto: added test for dh priv key generation

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Arkadiusz Kusztal May 20, 2022, 5:54 a.m. UTC

  - Moved dh operation type to dh operation struct.
This commit reflects changes to the asymmetric crypto API.

Signed-off-by: Arek Kusztal <arkadiuszx.kusztal@intel.com>
---
 drivers/crypto/openssl/rte_openssl_pmd.c     | 15 ++++++---------
 drivers/crypto/openssl/rte_openssl_pmd_ops.c |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c
index 2a3930df0a..c4ac767052 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -1692,12 +1692,12 @@  process_openssl_dh_op(struct rte_crypto_op *cop,
 		struct openssl_asym_session *sess)
 {
 	struct rte_crypto_dh_op_param *op = &cop->asym->dh;
+	struct rte_crypto_asym_op *asym_op = cop->asym;
 	DH *dh_key = sess->u.dh.dh_key;
 	BIGNUM *priv_key = NULL;
 	int ret = 0;
 
-	if (sess->u.dh.key_op &
-			(1 << RTE_CRYPTO_ASYM_KE_SHARED_SECRET_COMPUTE)) {
+	if (asym_op->dh.op_type == RTE_CRYPTO_ASYM_KE_SHARED_SECRET_COMPUTE) {
 		/* compute shared secret using peer public key
 		 * and current private key
 		 * shared secret = peer_key ^ priv_key mod p
@@ -1753,10 +1753,8 @@  process_openssl_dh_op(struct rte_crypto_op *cop,
 	 * if user provides private key,
 	 * then first set DH with user provided private key
 	 */
-	if ((sess->u.dh.key_op &
-			(1 << RTE_CRYPTO_ASYM_KE_PUBLIC_KEY_GENERATE)) &&
-			!(sess->u.dh.key_op &
-			(1 << RTE_CRYPTO_ASYM_KE_PRIVATE_KEY_GENERATE))) {
+	if (asym_op->dh.op_type == RTE_CRYPTO_ASYM_KE_PUBLIC_KEY_GENERATE &&
+			op->priv_key.data) {
 		/* generate public key using user-provided private key
 		 * pub_key = g ^ priv_key mod p
 		 */
@@ -1790,7 +1788,7 @@  process_openssl_dh_op(struct rte_crypto_op *cop,
 		return 0;
 	}
 
-	if (sess->u.dh.key_op & (1 << RTE_CRYPTO_ASYM_KE_PUBLIC_KEY_GENERATE)) {
+	if (asym_op->dh.op_type == RTE_CRYPTO_ASYM_KE_PUBLIC_KEY_GENERATE) {
 		const BIGNUM *pub_key = NULL;
 
 		OPENSSL_LOG(DEBUG, "%s:%d update public key\n",
@@ -1804,8 +1802,7 @@  process_openssl_dh_op(struct rte_crypto_op *cop,
 				op->pub_key.data);
 	}
 
-	if (sess->u.dh.key_op &
-			(1 << RTE_CRYPTO_ASYM_KE_PRIVATE_KEY_GENERATE)) {
+	if (asym_op->dh.op_type == RTE_CRYPTO_ASYM_KE_PRIVATE_KEY_GENERATE) {
 		const BIGNUM *priv_key = NULL;
 
 		OPENSSL_LOG(DEBUG, "%s:%d updated priv key\n",
diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index a1be96bf1d..737ec5de80 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -999,7 +999,6 @@  static int openssl_set_asym_session_parameters(
 		 * DH Priv key generate, or both
 		 * public and private key generate
 		 */
-		asym_session->u.dh.key_op = (1 << xform->dh.type);
 		asym_session->u.dh.dh_key = dh;
 		asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_DH;
 		break;