diff options
| author | Janne Peltonen <janne.peltonen@nokia.com> | 2023-04-13 13:53:12 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2023-04-18 14:23:54 +0300 |
| commit | e9b30faf553e1a361ce9713657b35799c680cc79 (patch) | |
| tree | cb8c78ad4ce488f4b06a02017fbcd932a90471db /platform/linux-dpdk | |
| parent | 157db58bf2f87d986c925f5f0fb54a2c67d312d3 (diff) | |
Port 18931e32a "linux-gen: crypto: do not set odp_crypto_packet_result_t::ok"
Port original commit from linux-generic.
Signed-off-by: Janne Peltonen <janne.peltonen@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
Diffstat (limited to 'platform/linux-dpdk')
| -rw-r--r-- | platform/linux-dpdk/odp_crypto.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c index 8fc18f88d..ec4a7b532 100644 --- a/platform/linux-dpdk/odp_crypto.c +++ b/platform/linux-dpdk/odp_crypto.c @@ -2077,7 +2077,6 @@ static void op_finish(crypto_op_t *op) struct rte_crypto_op *rte_op = (struct rte_crypto_op *)op; odp_crypto_alg_err_t rc_cipher; odp_crypto_alg_err_t rc_auth; - odp_bool_t result_ok; odp_crypto_packet_result_t *op_result; if (odp_likely(op->state.status == S_DEV)) { @@ -2085,7 +2084,6 @@ static void op_finish(crypto_op_t *op) if (odp_likely(rte_op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)) { rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; rc_auth = ODP_CRYPTO_ALG_ERR_NONE; - result_ok = true; if (session->p.op == ODP_CRYPTO_OP_ENCODE && session->p.auth_digest_len != 0) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); @@ -2096,36 +2094,30 @@ static void op_finish(crypto_op_t *op) pkt_hdr->crypto_digest_buf); } } else if (rte_op->status == RTE_CRYPTO_OP_STATUS_AUTH_FAILED) { - result_ok = false; rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; rc_auth = ODP_CRYPTO_ALG_ERR_ICV_CHECK; } else { - result_ok = false; - rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; - rc_auth = ODP_CRYPTO_ALG_ERR_NONE; + rc_cipher = ODP_CRYPTO_ALG_ERR_DATA_SIZE; + rc_auth = ODP_CRYPTO_ALG_ERR_DATA_SIZE; } } else if (odp_unlikely(op->state.status == S_NOP)) { /* null cipher & null auth, cryptodev skipped */ - result_ok = true; rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; rc_auth = ODP_CRYPTO_ALG_ERR_NONE; } else if (op->state.status == S_ERROR_LIN) { /* packet linearization error before cryptodev enqueue */ - result_ok = false; rc_cipher = ODP_CRYPTO_ALG_ERR_DATA_SIZE; rc_auth = ODP_CRYPTO_ALG_ERR_DATA_SIZE; } else if (op->state.status == S_ERROR_HASH_OFFSET) { /* hash offset not supported */ - result_ok = false; rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; rc_auth = ODP_CRYPTO_ALG_ERR_DATA_SIZE; } else { /* * other error before cryptodev enqueue */ - result_ok = false; - rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; - rc_auth = ODP_CRYPTO_ALG_ERR_NONE; + rc_cipher = ODP_CRYPTO_ALG_ERR_DATA_SIZE; + rc_auth = ODP_CRYPTO_ALG_ERR_DATA_SIZE; } /* Fill in result */ @@ -2133,11 +2125,6 @@ static void op_finish(crypto_op_t *op) op_result = &packet_hdr(pkt)->crypto_op_result; op_result->cipher_status.alg_err = rc_cipher; op_result->auth_status.alg_err = rc_auth; -#if ODP_DEPRECATED_API - op_result->cipher_status.hw_err = ODP_CRYPTO_HW_ERR_NONE; - op_result->auth_status.hw_err = ODP_CRYPTO_HW_ERR_NONE; -#endif - op_result->ok = result_ok; } static |