[dpdk-stable] [PATCH] app/crypto-perf: fix length for wireless algos

[dpdk-stable] [PATCH] app/crypto-perf: fix length for wireless algos

[Pablo de Lara]

When SNOW3G/KASUMI/ZUC algorithms are used, ciphering
and authentication lengths have to be passed as bits
and not as bytes.

Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 app/test-crypto-perf/cperf_ops.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index 0387354..c2c3db5 100644
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -107,7 +107,13 @@ cperf_set_ops_cipher(struct rte_crypto_op **ops,
 		sym_op->cipher.iv.phys_addr = test_vector->iv.phys_addr;
 		sym_op->cipher.iv.length = test_vector->iv.length;
 
-		sym_op->cipher.data.length = options->test_buffer_size;
+		if (options->cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+				options->cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+				options->cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3)
+			sym_op->cipher.data.length = options->test_buffer_size << 3;
+		else
+			sym_op->cipher.data.length = options->test_buffer_size;
+
 		sym_op->cipher.data.offset = 0;
 	}
 
@@ -166,7 +172,13 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
 
 		}
 
-		sym_op->auth.data.length = options->test_buffer_size;
+		if (options->auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+				options->auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+				options->auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3)
+			sym_op->auth.data.length = options->test_buffer_size << 3;
+		else
+			sym_op->auth.data.length = options->test_buffer_size;
+
 		sym_op->auth.data.offset = 0;
 	}
 
@@ -195,7 +207,13 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
 		sym_op->cipher.iv.phys_addr = test_vector->iv.phys_addr;
 		sym_op->cipher.iv.length = test_vector->iv.length;
 
-		sym_op->cipher.data.length = options->test_buffer_size;
+		if (options->cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+				options->cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+				options->cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3)
+			sym_op->cipher.data.length = options->test_buffer_size << 3;
+		else
+			sym_op->cipher.data.length = options->test_buffer_size;
+
 		sym_op->cipher.data.offset = 0;
 
 		/* authentication parameters */
@@ -232,7 +250,13 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
 			sym_op->auth.aad.length = options->auth_aad_sz;
 		}
 
-		sym_op->auth.data.length = options->test_buffer_size;
+		if (options->auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+				options->auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+				options->auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3)
+			sym_op->auth.data.length = options->test_buffer_size << 3;
+		else
+			sym_op->auth.data.length = options->test_buffer_size;
+
 		sym_op->auth.data.offset = 0;
 	}
 
-- 
2.7.4

Re: [dpdk-stable] [PATCH] app/crypto-perf: fix length for wireless algos

[De Lara Guarch, Pablo]

> -----Original Message-----
> From: De Lara Guarch, Pablo
> Sent: Monday, April 10, 2017 10:58 AM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; De Lara Guarch, Pablo
> Subject: [PATCH] app/crypto-perf: fix length for wireless algos
> 
> When SNOW3G/KASUMI/ZUC algorithms are used, ciphering
> and authentication lengths have to be passed as bits
> and not as bytes.
> 
> Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test
> application")
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied to dpdk-next-crypto.

Pablo