cryptodev: fix KASUMI F9 expected parameters

[dpdk.git] / drivers / crypto / kasumi / rte_kasumi_pmd.c

diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 6c8da17..0e12913 100644 (file)
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -142,12 +142,6 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
 
                sess->auth_op = auth_xform->auth.op;
 
-               sess->auth_iv_offset = auth_xform->auth.iv.offset;
-               if (auth_xform->auth.iv.length != KASUMI_IV_LENGTH) {
-                       KASUMI_LOG_ERR("Wrong IV length");
-                       return -EINVAL;
-               }
-
                /* Initialize key */
                sso_kasumi_init_f9_key_sched(auth_xform->auth.key.data,
                                &sess->pKeySched_hash);
@@ -163,27 +157,40 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
 static struct kasumi_session *
 kasumi_get_session(struct kasumi_qp *qp, struct rte_crypto_op *op)
 {
-       struct kasumi_session *sess;
+       struct kasumi_session *sess = NULL;
 
        if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
-               if (unlikely(op->sym->session->driver_id !=
-                               cryptodev_driver_id))
+               if (likely(op->sym->session != NULL))
+                       sess = (struct kasumi_session *)
+                                       get_session_private_data(
+                                       op->sym->session,
+                                       cryptodev_driver_id);
+       } else {
+               void *_sess = NULL;
+               void *_sess_private_data = NULL;
+
+               if (rte_mempool_get(qp->sess_mp, (void **)&_sess))
                        return NULL;
 
-               sess = (struct kasumi_session *)op->sym->session->_private;
-       } else  {
-               struct rte_cryptodev_session *c_sess = NULL;
-
-               if (rte_mempool_get(qp->sess_mp, (void **)&c_sess))
+               if (rte_mempool_get(qp->sess_mp, (void **)&_sess_private_data))
                        return NULL;
 
-               sess = (struct kasumi_session *)c_sess->_private;
+               sess = (struct kasumi_session *)_sess_private_data;
 
                if (unlikely(kasumi_set_session_parameters(sess,
-                               op->sym->xform) != 0))
-                       return NULL;
+                               op->sym->xform) != 0)) {
+                       rte_mempool_put(qp->sess_mp, _sess);
+                       rte_mempool_put(qp->sess_mp, _sess_private_data);
+                       sess = NULL;
+               }
+               op->sym->session = (struct rte_cryptodev_sym_session *)_sess;
+               set_session_private_data(op->sym->session, cryptodev_driver_id,
+                       _sess_private_data);
        }
 
+       if (unlikely(sess == NULL))
+               op->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
+
        return sess;
 }
 
@@ -261,12 +268,8 @@ process_kasumi_hash_op(struct rte_crypto_op **ops,
        unsigned i;
        uint8_t processed_ops = 0;
        uint8_t *src, *dst;
-       uint8_t *iv_ptr;
        uint32_t length_in_bits;
        uint32_t num_bytes;
-       uint32_t shift_bits;
-       uint64_t iv;
-       uint8_t direction;
 
        for (i = 0; i < num_ops; i++) {
                /* Data must be byte aligned */
@@ -280,21 +283,15 @@ process_kasumi_hash_op(struct rte_crypto_op **ops,
 
                src = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) +
                                (ops[i]->sym->auth.data.offset >> 3);
-               iv_ptr = rte_crypto_op_ctod_offset(ops[i], uint8_t *,
-                               session->auth_iv_offset);
-               iv = *((uint64_t *)(iv_ptr));
                /* Direction from next bit after end of message */
-               num_bytes = (length_in_bits >> 3) + 1;
-               shift_bits = (BYTE_LEN - 1 - length_in_bits) % BYTE_LEN;
-               direction = (src[num_bytes - 1] >> shift_bits) & 0x01;
+               num_bytes = length_in_bits >> 3;
 
                if (session->auth_op == RTE_CRYPTO_AUTH_OP_VERIFY) {
                        dst = (uint8_t *)rte_pktmbuf_append(ops[i]->sym->m_src,
                                        KASUMI_DIGEST_LENGTH);
+                       sso_kasumi_f9_1_buffer(&session->pKeySched_hash, src,
+                                       num_bytes, dst);
 
-                       sso_kasumi_f9_1_buffer_user(&session->pKeySched_hash,
-                                       iv, src,
-                                       length_in_bits, dst, direction);
                        /* Verify digest. */
                        if (memcmp(dst, ops[i]->sym->auth.digest.data,
                                        KASUMI_DIGEST_LENGTH) != 0)
@@ -306,9 +303,8 @@ process_kasumi_hash_op(struct rte_crypto_op **ops,
                } else  {
                        dst = ops[i]->sym->auth.digest.data;
 
-                       sso_kasumi_f9_1_buffer_user(&session->pKeySched_hash,
-                                       iv, src,
-                                       length_in_bits, dst, direction);
+                       sso_kasumi_f9_1_buffer(&session->pKeySched_hash, src,
+                                       num_bytes, dst);
                }
                processed_ops++;
        }
@@ -358,6 +354,10 @@ process_ops(struct rte_crypto_op **ops, struct kasumi_session *session,
                        ops[i]->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
                /* Free session if a session-less crypto op. */
                if (ops[i]->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {
+                       memset(session, 0, sizeof(struct kasumi_session));
+                       memset(ops[i]->sym->session, 0,
+                                       rte_cryptodev_get_header_session_size());
+                       rte_mempool_put(qp->sess_mp, session);
                        rte_mempool_put(qp->sess_mp, ops[i]->sym->session);
                        ops[i]->sym->session = NULL;
                }
@@ -410,7 +410,8 @@ process_op_bit(struct rte_crypto_op *op, struct kasumi_session *session,
 
        /* Free session if a session-less crypto op. */
        if (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {
-               rte_mempool_put(qp->sess_mp, op->sym->session);
+               memset(op->sym->session, 0, sizeof(struct kasumi_session));
+               rte_cryptodev_sym_session_free(op->sym->session);
                op->sym->session = NULL;
        }