crypto/kasumi: do not append digest

[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 cff40fb..7a00bd3 100644 (file)
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -44,7 +44,6 @@
 
 #define KASUMI_KEY_LENGTH 16
 #define KASUMI_IV_LENGTH 8
-#define KASUMI_DIGEST_LENGTH 4
 #define KASUMI_MAX_BURST 4
 #define BYTE_LEN 8
 
@@ -111,13 +110,13 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
        case KASUMI_OP_NOT_SUPPORTED:
        default:
                KASUMI_LOG_ERR("Unsupported operation chain order parameter");
-               return -EINVAL;
+               return -ENOTSUP;
        }
 
        if (cipher_xform) {
                /* Only KASUMI F8 supported */
                if (cipher_xform->cipher.algo != RTE_CRYPTO_CIPHER_KASUMI_F8)
-                       return -EINVAL;
+                       return -ENOTSUP;
 
                sess->cipher_iv_offset = cipher_xform->cipher.iv.offset;
                if (cipher_xform->cipher.iv.length != KASUMI_IV_LENGTH) {
@@ -133,7 +132,7 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
        if (auth_xform) {
                /* Only KASUMI F9 supported */
                if (auth_xform->auth.algo != RTE_CRYPTO_AUTH_KASUMI_F9)
-                       return -EINVAL;
+                       return -ENOTSUP;
 
                if (auth_xform->auth.digest_length != KASUMI_DIGEST_LENGTH) {
                        KASUMI_LOG_ERR("Wrong digest length");
@@ -142,12 +141,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);
@@ -267,19 +260,15 @@ process_kasumi_cipher_op_bit(struct rte_crypto_op *op,
 
 /** Generate/verify hash from mbufs with same hash key. */
 static int
-process_kasumi_hash_op(struct rte_crypto_op **ops,
+process_kasumi_hash_op(struct kasumi_qp *qp, struct rte_crypto_op **ops,
                struct kasumi_session *session,
                uint8_t num_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 */
@@ -293,35 +282,23 @@ 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);
+                       dst = qp->temp_digest;
+                       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)
                                ops[i]->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
-
-                       /* Trim area used for digest from mbuf. */
-                       rte_pktmbuf_trim(ops[i]->sym->m_src,
-                                       KASUMI_DIGEST_LENGTH);
                } 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++;
        }
@@ -344,16 +321,16 @@ process_ops(struct rte_crypto_op **ops, struct kasumi_session *session,
                                session, num_ops);
                break;
        case KASUMI_OP_ONLY_AUTH:
-               processed_ops = process_kasumi_hash_op(ops, session,
+               processed_ops = process_kasumi_hash_op(qp, ops, session,
                                num_ops);
                break;
        case KASUMI_OP_CIPHER_AUTH:
                processed_ops = process_kasumi_cipher_op(ops, session,
                                num_ops);
-               process_kasumi_hash_op(ops, session, processed_ops);
+               process_kasumi_hash_op(qp, ops, session, processed_ops);
                break;
        case KASUMI_OP_AUTH_CIPHER:
-               processed_ops = process_kasumi_hash_op(ops, session,
+               processed_ops = process_kasumi_hash_op(qp, ops, session,
                                num_ops);
                process_kasumi_cipher_op(ops, session, processed_ops);
                break;
@@ -401,15 +378,15 @@ process_op_bit(struct rte_crypto_op *op, struct kasumi_session *session,
                                session);
                break;
        case KASUMI_OP_ONLY_AUTH:
-               processed_op = process_kasumi_hash_op(&op, session, 1);
+               processed_op = process_kasumi_hash_op(qp, &op, session, 1);
                break;
        case KASUMI_OP_CIPHER_AUTH:
                processed_op = process_kasumi_cipher_op_bit(op, session);
                if (processed_op == 1)
-                       process_kasumi_hash_op(&op, session, 1);
+                       process_kasumi_hash_op(qp, &op, session, 1);
                break;
        case KASUMI_OP_AUTH_CIPHER:
-               processed_op = process_kasumi_hash_op(&op, session, 1);
+               processed_op = process_kasumi_hash_op(qp, &op, session, 1);
                if (processed_op == 1)
                        process_kasumi_cipher_op_bit(op, session);
                break;
@@ -678,10 +655,13 @@ static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = {
        .remove = cryptodev_kasumi_remove
 };
 
+static struct cryptodev_driver kasumi_crypto_drv;
+
 RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd_drv);
 RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_KASUMI_PMD, cryptodev_kasumi_pmd);
 RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_KASUMI_PMD,
        "max_nb_queue_pairs=<int> "
        "max_nb_sessions=<int> "
        "socket_id=<int>");
-RTE_PMD_REGISTER_CRYPTO_DRIVER(cryptodev_kasumi_pmd_drv, cryptodev_driver_id);
+RTE_PMD_REGISTER_CRYPTO_DRIVER(kasumi_crypto_drv, cryptodev_kasumi_pmd_drv,
+               cryptodev_driver_id);