cryptodev: remove crypto device type enumeration
[dpdk.git] / drivers / crypto / openssl / rte_openssl_pmd_ops.c
index 9e3f9a3..6093b61 100644 (file)
@@ -344,12 +344,12 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                        }, }
                }, }
        },
-       {       /* AES GCM (AUTH) */
+       {       /* AES GCM */
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
                {.sym = {
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-                       {.auth = {
-                               .algo = RTE_CRYPTO_AUTH_AES_GCM,
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
+                       {.aead = {
+                               .algo = RTE_CRYPTO_AEAD_AES_GCM,
                                .block_size = 16,
                                .key_size = {
                                        .min = 16,
@@ -366,27 +366,11 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 65535,
                                        .increment = 1
                                },
-                               .iv_size = { 0 }
-                       }, }
-               }, }
-       },
-       {       /* AES GCM (CIPHER) */
-               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-               {.sym = {
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-                       {.cipher = {
-                               .algo = RTE_CRYPTO_CIPHER_AES_GCM,
-                               .block_size = 16,
-                               .key_size = {
-                                       .min = 16,
-                                       .max = 32,
-                                       .increment = 8
-                               },
                                .iv_size = {
                                        .min = 12,
                                        .max = 16,
                                        .increment = 4
-                               }
+                               },
                        }, }
                }, }
        },
@@ -407,12 +391,11 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 16,
                                        .increment = 0
                                },
-                               .aad_size = {
-                                       .min = 8,
-                                       .max = 65532,
+                               .iv_size = {
+                                       .min = 12,
+                                       .max = 16,
                                        .increment = 4
-                               },
-                               .iv_size = { 0 }
+                               }
                        }, }
                }, }
        },
@@ -550,7 +533,7 @@ openssl_pmd_info_get(struct rte_cryptodev *dev,
        struct openssl_private *internals = dev->data->dev_private;
 
        if (dev_info != NULL) {
-               dev_info->dev_type = dev->dev_type;
+               dev_info->driver_id = dev->driver_id;
                dev_info->feature_flags = dev->feature_flags;
                dev_info->capabilities = openssl_pmd_capabilities;
                dev_info->max_nb_queue_pairs = internals->max_nb_qpairs;