Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/110327

_apply patch failure_

Submitter: Arek Kusztal <arkadiuszx.kusztal@intel.com>
Date: Wednesday, April 27 2022 09:55:24 
Applied on: CommitID:55ae8965bf8eecd5ebec36663bb0f36018abf64b
Apply patch set 110327 failed:

Checking patch lib/cryptodev/rte_crypto_asym.h...
error: while searching for:
};

/**
 * Diffie-Hellman Operations params.
 * @note:
 */
struct rte_crypto_dh_op_param {
	enum rte_crypto_asym_op_type op_type;
	/**< Diffie-Hellman operation type */
	rte_crypto_uint pub_key;
	/**<
	 * Output generated public key when op_type is
	 * DH PUB_KEY_GENERATION.
	 * Input peer public key when op_type is DH
	 * SHARED_SECRET_COMPUTATION
	 *
	 */

	rte_crypto_uint priv_key;
	/**<
	 * Output generated private key if op_type is
	 * DH PRIVATE_KEY_GENERATION
	 * Input when op_type is DH SHARED_SECRET_COMPUTATION.
	 *
	 */

	rte_crypto_uint shared_secret;
	/**<
	 * Output with calculated shared secret
	 * when dh op_type = SHARED_SECRET_COMPUTATION.
	 *
	 */
};


error: patch failed: lib/cryptodev/rte_crypto_asym.h:385
Applying patch lib/cryptodev/rte_crypto_asym.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
diff a/lib/cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h	(rejected hunks)
@@ -385,34 +387,38 @@ struct rte_crypto_rsa_op_param {
 };
 
 /**
- * Diffie-Hellman Operations params.
+ * Diffie-Hellman/Elliptic Curve Diffie-Hellman operation.
  * @note:
  */
 struct rte_crypto_dh_op_param {
 	enum rte_crypto_asym_op_type op_type;
 	/**< Diffie-Hellman operation type */
-	rte_crypto_uint pub_key;
+	rte_crypto_param priv_key;
 	/**<
-	 * Output generated public key when op_type is
-	 * DH PUB_KEY_GENERATION.
-	 * Input peer public key when op_type is DH
-	 * SHARED_SECRET_COMPUTATION
-	 *
+	 * Diffie-Hellman private part
+	 * For DH and ECDH it is big-endian integer.
+	 * Input for both phases of Diffie-Hellman
 	 */
-
-	rte_crypto_uint priv_key;
+	union {
+		rte_crypto_uint pub_key;
+		struct rte_crypto_ec_point pub_point;
+	};
 	/**<
-	 * Output generated private key if op_type is
-	 * DH PRIVATE_KEY_GENERATION
-	 * Input when op_type is DH SHARED_SECRET_COMPUTATION.
-	 *
+	 * Diffie-Hellman public part
+	 * For DH it is big-endian unsigned integer.
+	 * For ECDH it is a point on the curve.
+	 * Output for RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE
+	 * Input for RTE_CRYPTO_ASYM_OP_SHARED_SECRET_COMPUTE
 	 */
-
-	rte_crypto_uint shared_secret;
+	union {
+		rte_crypto_uint shared_secret;
+		struct rte_crypto_ec_point shared_point;
+	};
 	/**<
-	 * Output with calculated shared secret
-	 * when dh op_type = SHARED_SECRET_COMPUTATION.
-	 *
+	 * Diffie-Hellman shared secret
+	 * For DH it is big-endian unsigned integer.
+	 * For ECDH it is a point on the curve.
+	 * Output for RTE_CRYPTO_ASYM_OP_SHARED_SECRET_COMPUTE
 	 */
 };
 

https://lab.dpdk.org/results/dashboard/patchsets/21929/

UNH-IOL DPDK Community Lab