cryptodev: use AES-GCM/CCM as AEAD algorithms
[dpdk.git] / drivers / crypto / openssl / rte_openssl_pmd.c
index 09173b2..7280a0d 100644 (file)
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2016 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2016-2017 Intel Corporation. All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -34,6 +34,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -42,7 +43,9 @@
 
 #include "rte_openssl_pmd_private.h"
 
-static int cryptodev_openssl_remove(const char *name);
+#define DES_BLOCK_SIZE 8
+
+static int cryptodev_openssl_remove(struct rte_vdev_device *vdev);
 
 /*----------------------------------------------------------------------------*/
 
@@ -86,6 +89,8 @@ openssl_get_chain_order(const struct rte_crypto_sym_xform *xform)
                        else if (xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH)
                                res =  OPENSSL_CHAIN_CIPHER_AUTH;
                }
+               if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD)
+                       res = OPENSSL_CHAIN_COMBINED;
        }
 
        return res;
@@ -181,21 +186,6 @@ get_cipher_algo(enum rte_crypto_cipher_algorithm sess_algo, size_t keylen,
                                res = -EINVAL;
                        }
                        break;
-               case RTE_CRYPTO_CIPHER_AES_GCM:
-                       switch (keylen) {
-                       case 16:
-                               *algo = EVP_aes_128_gcm();
-                               break;
-                       case 24:
-                               *algo = EVP_aes_192_gcm();
-                               break;
-                       case 32:
-                               *algo = EVP_aes_256_gcm();
-                               break;
-                       default:
-                               res = -EINVAL;
-                       }
-                       break;
                default:
                        res = -EINVAL;
                        break;
@@ -251,6 +241,41 @@ get_auth_algo(enum rte_crypto_auth_algorithm sessalgo,
        return res;
 }
 
+/** Get adequate openssl function for input cipher algorithm */
+static uint8_t
+get_aead_algo(enum rte_crypto_aead_algorithm sess_algo, size_t keylen,
+               const EVP_CIPHER **algo)
+{
+       int res = 0;
+
+       if (algo != NULL) {
+               switch (sess_algo) {
+               case RTE_CRYPTO_AEAD_AES_GCM:
+                       switch (keylen) {
+                       case 16:
+                               *algo = EVP_aes_128_gcm();
+                               break;
+                       case 24:
+                               *algo = EVP_aes_192_gcm();
+                               break;
+                       case 32:
+                               *algo = EVP_aes_256_gcm();
+                               break;
+                       default:
+                               res = -EINVAL;
+                       }
+                       break;
+               default:
+                       res = -EINVAL;
+                       break;
+               }
+       } else {
+               res = -EINVAL;
+       }
+
+       return res;
+}
+
 /** Set session cipher parameters */
 static int
 openssl_set_session_cipher_parameters(struct openssl_session *sess,
@@ -261,12 +286,15 @@ openssl_set_session_cipher_parameters(struct openssl_session *sess,
        /* Select cipher key */
        sess->cipher.key.length = xform->cipher.key.length;
 
+       /* Set IV parameters */
+       sess->iv.offset = xform->cipher.iv.offset;
+       sess->iv.length = xform->cipher.iv.length;
+
        /* Select cipher algo */
        switch (xform->cipher.algo) {
        case RTE_CRYPTO_CIPHER_3DES_CBC:
        case RTE_CRYPTO_CIPHER_AES_CBC:
        case RTE_CRYPTO_CIPHER_AES_CTR:
-       case RTE_CRYPTO_CIPHER_AES_GCM:
                sess->cipher.mode = OPENSSL_CIPHER_LIB;
                sess->cipher.algo = xform->cipher.algo;
                sess->cipher.ctx = EVP_CIPHER_CTX_new();
@@ -289,7 +317,21 @@ openssl_set_session_cipher_parameters(struct openssl_session *sess,
                                sess->cipher.key.data) != 0)
                        return -EINVAL;
                break;
+       case RTE_CRYPTO_CIPHER_DES_DOCSISBPI:
+               sess->cipher.algo = xform->cipher.algo;
+               sess->chain_order = OPENSSL_CHAIN_CIPHER_BPI;
+               sess->cipher.ctx = EVP_CIPHER_CTX_new();
+               sess->cipher.evp_algo = EVP_des_cbc();
+
+               sess->cipher.bpi_ctx = EVP_CIPHER_CTX_new();
+               /* IV will be ECB encrypted whether direction is encrypt or decrypt */
+               if (EVP_EncryptInit_ex(sess->cipher.bpi_ctx, EVP_des_ecb(),
+                               NULL, xform->cipher.key.data, 0) != 1)
+                       return -EINVAL;
 
+               get_cipher_key(xform->cipher.key.data, sess->cipher.key.length,
+                       sess->cipher.key.data);
+               break;
        default:
                sess->cipher.algo = RTE_CRYPTO_CIPHER_NULL;
                return -EINVAL;
@@ -310,11 +352,33 @@ openssl_set_session_auth_parameters(struct openssl_session *sess,
        /* Select auth algo */
        switch (xform->auth.algo) {
        case RTE_CRYPTO_AUTH_AES_GMAC:
-       case RTE_CRYPTO_AUTH_AES_GCM:
-               /* Check additional condition for AES_GMAC/GCM */
-               if (sess->cipher.algo != RTE_CRYPTO_CIPHER_AES_GCM)
-                       return -EINVAL;
                sess->chain_order = OPENSSL_CHAIN_COMBINED;
+
+               /* Set IV parameters */
+               sess->iv.offset = xform->auth.iv.offset;
+               sess->iv.length = xform->auth.iv.length;
+
+               /*
+                * OpenSSL requires GMAC to be a GCM operation
+                * with no cipher data length
+                */
+               sess->cipher.mode = OPENSSL_CIPHER_LIB;
+               if (sess->auth.operation == RTE_CRYPTO_AUTH_OP_GENERATE)
+                       sess->cipher.direction = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+               else
+                       sess->cipher.direction = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+
+               sess->cipher.key.length = xform->auth.key.length;
+               sess->cipher.ctx = EVP_CIPHER_CTX_new();
+
+               if (get_aead_algo(RTE_CRYPTO_AEAD_AES_GCM,
+                               sess->cipher.key.length,
+                               &sess->cipher.evp_algo) != 0)
+                       return -EINVAL;
+
+               get_cipher_key(xform->auth.key.data, xform->auth.key.length,
+                       sess->cipher.key.data);
+
                break;
 
        case RTE_CRYPTO_AUTH_MD5:
@@ -349,6 +413,53 @@ openssl_set_session_auth_parameters(struct openssl_session *sess,
                return -EINVAL;
        }
 
+       sess->auth.aad_length = xform->auth.add_auth_data_length;
+       sess->auth.digest_length = xform->auth.digest_length;
+
+       return 0;
+}
+
+/* Set session AEAD parameters */
+static int
+openssl_set_session_aead_parameters(struct openssl_session *sess,
+               const struct rte_crypto_sym_xform *xform)
+{
+       /* Select cipher direction */
+       sess->cipher.direction = xform->cipher.op;
+       /* Select cipher key */
+       sess->cipher.key.length = xform->aead.key.length;
+
+       /* Set IV parameters */
+       sess->iv.offset = xform->aead.iv.offset;
+       sess->iv.length = xform->aead.iv.length;
+
+       /* Select auth generate/verify */
+       sess->auth.operation = xform->auth.op;
+       sess->auth.algo = xform->auth.algo;
+
+       /* Select auth algo */
+       switch (xform->aead.algo) {
+       case RTE_CRYPTO_AEAD_AES_GCM:
+               sess->cipher.mode = OPENSSL_CIPHER_LIB;
+               sess->aead_algo = xform->aead.algo;
+               sess->cipher.ctx = EVP_CIPHER_CTX_new();
+
+               if (get_aead_algo(sess->aead_algo, sess->cipher.key.length,
+                               &sess->cipher.evp_algo) != 0)
+                       return -EINVAL;
+
+               get_cipher_key(xform->cipher.key.data, sess->cipher.key.length,
+                       sess->cipher.key.data);
+
+               sess->chain_order = OPENSSL_CHAIN_COMBINED;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       sess->auth.aad_length = xform->aead.add_auth_data_length;
+       sess->auth.digest_length = xform->aead.digest_length;
+
        return 0;
 }
 
@@ -359,6 +470,7 @@ openssl_set_session_parameters(struct openssl_session *sess,
 {
        const struct rte_crypto_sym_xform *cipher_xform = NULL;
        const struct rte_crypto_sym_xform *auth_xform = NULL;
+       const struct rte_crypto_sym_xform *aead_xform = NULL;
 
        sess->chain_order = openssl_get_chain_order(xform);
        switch (sess->chain_order) {
@@ -376,10 +488,16 @@ openssl_set_session_parameters(struct openssl_session *sess,
                auth_xform = xform;
                cipher_xform = xform->next;
                break;
+       case OPENSSL_CHAIN_COMBINED:
+               aead_xform = xform;
+               break;
        default:
                return -EINVAL;
        }
 
+       /* Default IV length = 0 */
+       sess->iv.length = 0;
+
        /* cipher_xform must be check before auth_xform */
        if (cipher_xform) {
                if (openssl_set_session_cipher_parameters(
@@ -398,6 +516,14 @@ openssl_set_session_parameters(struct openssl_session *sess,
                }
        }
 
+       if (aead_xform) {
+               if (openssl_set_session_aead_parameters(sess, aead_xform)) {
+                       OPENSSL_LOG_ERR(
+                               "Invalid/unsupported auth parameters");
+                       return -EINVAL;
+               }
+       }
+
        return 0;
 }
 
@@ -407,6 +533,9 @@ openssl_reset_session(struct openssl_session *sess)
 {
        EVP_CIPHER_CTX_free(sess->cipher.ctx);
 
+       if (sess->chain_order == OPENSSL_CHAIN_CIPHER_BPI)
+               EVP_CIPHER_CTX_free(sess->cipher.bpi_ctx);
+
        switch (sess->auth.mode) {
        case OPENSSL_AUTH_AS_AUTH:
                EVP_MD_CTX_destroy(sess->auth.auth.ctx);
@@ -426,7 +555,7 @@ get_session(struct openssl_qp *qp, struct rte_crypto_op *op)
 {
        struct openssl_session *sess = NULL;
 
-       if (op->sym->sess_type == RTE_CRYPTO_SYM_OP_WITH_SESSION) {
+       if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
                /* get existing session */
                if (likely(op->sym->session != NULL &&
                                op->sym->session->dev_type ==
@@ -577,6 +706,29 @@ process_cipher_encrypt_err:
        return -EINVAL;
 }
 
+/** Process standard openssl cipher encryption */
+static int
+process_openssl_cipher_bpi_encrypt(uint8_t *src, uint8_t *dst,
+               uint8_t *iv, int srclen,
+               EVP_CIPHER_CTX *ctx)
+{
+       uint8_t i;
+       uint8_t encrypted_iv[DES_BLOCK_SIZE];
+       int encrypted_ivlen;
+
+       if (EVP_EncryptUpdate(ctx, encrypted_iv, &encrypted_ivlen,
+                       iv, DES_BLOCK_SIZE) <= 0)
+               goto process_cipher_encrypt_err;
+
+       for (i = 0; i < srclen; i++)
+               *(dst + i) = *(src + i) ^ (encrypted_iv[i]);
+
+       return 0;
+
+process_cipher_encrypt_err:
+       OPENSSL_LOG_ERR("Process openssl cipher bpi encrypt failed");
+       return -EINVAL;
+}
 /** Process standard openssl cipher decryption */
 static int
 process_openssl_cipher_decrypt(struct rte_mbuf *mbuf_src, uint8_t *dst,
@@ -870,6 +1022,7 @@ process_openssl_combined_op
        /* cipher */
        uint8_t *dst = NULL, *iv, *tag, *aad;
        int srclen, ivlen, aadlen, status = -1;
+       uint32_t offset;
 
        /*
         * Segmented destination buffer is not supported for
@@ -880,34 +1033,41 @@ process_openssl_combined_op
                return;
        }
 
-       iv = op->sym->cipher.iv.data;
-       ivlen = op->sym->cipher.iv.length;
-       aad = op->sym->auth.aad.data;
-       aadlen = op->sym->auth.aad.length;
-
-       tag = op->sym->auth.digest.data;
-       if (tag == NULL)
-               tag = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
-                               op->sym->cipher.data.offset +
-                               op->sym->cipher.data.length);
-
-       if (sess->auth.algo == RTE_CRYPTO_AUTH_AES_GMAC)
+       iv = rte_crypto_op_ctod_offset(op, uint8_t *,
+                       sess->iv.offset);
+       ivlen = sess->iv.length;
+       if (sess->auth.algo == RTE_CRYPTO_AUTH_AES_GMAC) {
                srclen = 0;
-       else {
-               srclen = op->sym->cipher.data.length;
+               offset = op->sym->auth.data.offset;
+               aadlen = op->sym->auth.data.length;
+               aad = rte_pktmbuf_mtod_offset(mbuf_src, uint8_t *,
+                               op->sym->auth.data.offset);
+               tag = op->sym->auth.digest.data;
+               if (tag == NULL)
+                       tag = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
+                               offset + aadlen);
+       } else {
+               srclen = op->sym->aead.data.length;
                dst = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
-                               op->sym->cipher.data.offset);
+                               op->sym->aead.data.offset);
+               offset = op->sym->aead.data.offset;
+               aad = op->sym->aead.aad.data;
+               aadlen = sess->auth.aad_length;
+               tag = op->sym->aead.digest.data;
+               if (tag == NULL)
+                       tag = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
+                               offset + srclen);
        }
 
        if (sess->cipher.direction == RTE_CRYPTO_CIPHER_OP_ENCRYPT)
                status = process_openssl_auth_encryption_gcm(
-                               mbuf_src, op->sym->cipher.data.offset, srclen,
+                               mbuf_src, offset, srclen,
                                aad, aadlen, iv, ivlen, sess->cipher.key.data,
                                dst, tag, sess->cipher.ctx,
                                sess->cipher.evp_algo);
        else
                status = process_openssl_auth_decryption_gcm(
-                               mbuf_src, op->sym->cipher.data.offset, srclen,
+                               mbuf_src, offset, srclen,
                                aad, aadlen, iv, ivlen, sess->cipher.key.data,
                                dst, tag, sess->cipher.ctx,
                                sess->cipher.evp_algo);
@@ -944,7 +1104,8 @@ process_openssl_cipher_op
        dst = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
                        op->sym->cipher.data.offset);
 
-       iv = op->sym->cipher.iv.data;
+       iv = rte_crypto_op_ctod_offset(op, uint8_t *,
+                       sess->iv.offset);
 
        if (sess->cipher.mode == OPENSSL_CIPHER_LIB)
                if (sess->cipher.direction == RTE_CRYPTO_CIPHER_OP_ENCRYPT)
@@ -969,6 +1130,100 @@ process_openssl_cipher_op
                op->status = RTE_CRYPTO_OP_STATUS_ERROR;
 }
 
+/** Process cipher operation */
+static void
+process_openssl_docsis_bpi_op(struct rte_crypto_op *op,
+               struct openssl_session *sess, struct rte_mbuf *mbuf_src,
+               struct rte_mbuf *mbuf_dst)
+{
+       uint8_t *src, *dst, *iv;
+       uint8_t block_size, last_block_len;
+       int srclen, status = 0;
+
+       srclen = op->sym->cipher.data.length;
+       src = rte_pktmbuf_mtod_offset(mbuf_src, uint8_t *,
+                       op->sym->cipher.data.offset);
+       dst = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
+                       op->sym->cipher.data.offset);
+
+       iv = rte_crypto_op_ctod_offset(op, uint8_t *,
+                       sess->iv.offset);
+
+       block_size = DES_BLOCK_SIZE;
+
+       last_block_len = srclen % block_size;
+       if (sess->cipher.direction == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
+               /* Encrypt only with ECB mode XOR IV */
+               if (srclen < block_size) {
+                       status = process_openssl_cipher_bpi_encrypt(src, dst,
+                                       iv, srclen,
+                                       sess->cipher.bpi_ctx);
+               } else {
+                       srclen -= last_block_len;
+                       /* Encrypt with the block aligned stream with CBC mode */
+                       status = process_openssl_cipher_encrypt(mbuf_src, dst,
+                                       op->sym->cipher.data.offset, iv,
+                                       sess->cipher.key.data, srclen,
+                                       sess->cipher.ctx, sess->cipher.evp_algo);
+                       if (last_block_len) {
+                               /* Point at last block */
+                               dst += srclen;
+                               /*
+                                * IV is the last encrypted block from
+                                * the previous operation
+                                */
+                               iv = dst - block_size;
+                               src += srclen;
+                               srclen = last_block_len;
+                               /* Encrypt the last frame with ECB mode */
+                               status |= process_openssl_cipher_bpi_encrypt(src,
+                                               dst, iv,
+                                               srclen, sess->cipher.bpi_ctx);
+                       }
+               }
+       } else {
+               /* Decrypt only with ECB mode (encrypt, as it is same operation) */
+               if (srclen < block_size) {
+                       status = process_openssl_cipher_bpi_encrypt(src, dst,
+                                       iv,
+                                       srclen,
+                                       sess->cipher.bpi_ctx);
+               } else {
+                       if (last_block_len) {
+                               /* Point at last block */
+                               dst += srclen - last_block_len;
+                               src += srclen - last_block_len;
+                               /*
+                                * IV is the last full block
+                                */
+                               iv = src - block_size;
+                               /*
+                                * Decrypt the last frame with ECB mode
+                                * (encrypt, as it is the same operation)
+                                */
+                               status = process_openssl_cipher_bpi_encrypt(src,
+                                               dst, iv,
+                                               last_block_len, sess->cipher.bpi_ctx);
+                               /* Prepare parameters for CBC mode op */
+                               iv = rte_crypto_op_ctod_offset(op, uint8_t *,
+                                               sess->iv.offset);
+                               dst += last_block_len - srclen;
+                               srclen -= last_block_len;
+                       }
+
+                       /* Decrypt with CBC mode */
+                       status |= process_openssl_cipher_decrypt(mbuf_src, dst,
+                                       op->sym->cipher.data.offset, iv,
+                                       sess->cipher.key.data, srclen,
+                                       sess->cipher.ctx,
+                                       sess->cipher.evp_algo);
+               }
+       }
+
+       if (status != 0)
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+}
+
 /** Process auth operation */
 static void
 process_openssl_auth_op
@@ -982,7 +1237,7 @@ process_openssl_auth_op
 
        if (sess->auth.operation == RTE_CRYPTO_AUTH_OP_VERIFY)
                dst = (uint8_t *)rte_pktmbuf_append(mbuf_src,
-                               op->sym->auth.digest.length);
+                               sess->auth.digest_length);
        else {
                dst = op->sym->auth.digest.data;
                if (dst == NULL)
@@ -1010,11 +1265,11 @@ process_openssl_auth_op
 
        if (sess->auth.operation == RTE_CRYPTO_AUTH_OP_VERIFY) {
                if (memcmp(dst, op->sym->auth.digest.data,
-                               op->sym->auth.digest.length) != 0) {
+                               sess->auth.digest_length) != 0) {
                        op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
                }
                /* Trim area used for digest from mbuf. */
-               rte_pktmbuf_trim(mbuf_src, op->sym->auth.digest.length);
+               rte_pktmbuf_trim(mbuf_src, sess->auth.digest_length);
        }
 
        if (status != 0)
@@ -1052,13 +1307,16 @@ process_op(const struct openssl_qp *qp, struct rte_crypto_op *op,
        case OPENSSL_CHAIN_COMBINED:
                process_openssl_combined_op(op, sess, msrc, mdst);
                break;
+       case OPENSSL_CHAIN_CIPHER_BPI:
+               process_openssl_docsis_bpi_op(op, sess, msrc, mdst);
+               break;
        default:
                op->status = RTE_CRYPTO_OP_STATUS_ERROR;
                break;
        }
 
        /* Free session if a session-less crypto op */
-       if (op->sym->sess_type == RTE_CRYPTO_SYM_OP_SESSIONLESS) {
+       if (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {
                openssl_reset_session(sess);
                memset(sess, 0, sizeof(struct openssl_session));
                rte_mempool_put(qp->sess_mp, op->sym->session);
@@ -1127,25 +1385,21 @@ openssl_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,
 
 /** Create OPENSSL crypto device */
 static int
-cryptodev_openssl_create(struct rte_crypto_vdev_init_params *init_params)
+cryptodev_openssl_create(const char *name,
+                       struct rte_vdev_device *vdev,
+                       struct rte_crypto_vdev_init_params *init_params)
 {
        struct rte_cryptodev *dev;
        struct openssl_private *internals;
 
-       if (init_params->name[0] == '\0') {
-               int ret = rte_cryptodev_pmd_create_dev_name(
-                               init_params->name,
-                               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD));
-
-               if (ret < 0) {
-                       OPENSSL_LOG_ERR("failed to create unique name");
-                       return ret;
-               }
-       }
+       if (init_params->name[0] == '\0')
+               snprintf(init_params->name, sizeof(init_params->name),
+                               "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct openssl_private),
-                       init_params->socket_id);
+                       init_params->socket_id,
+                       vdev);
        if (dev == NULL) {
                OPENSSL_LOG_ERR("failed to create cryptodev vdev");
                goto init_error;
@@ -1175,14 +1429,13 @@ init_error:
        OPENSSL_LOG_ERR("driver %s: cryptodev_openssl_create failed",
                        init_params->name);
 
-       cryptodev_openssl_remove(init_params->name);
+       cryptodev_openssl_remove(vdev);
        return -EFAULT;
 }
 
 /** Initialise OPENSSL crypto device */
 static int
-cryptodev_openssl_probe(const char *name,
-               const char *input_args)
+cryptodev_openssl_probe(struct rte_vdev_device *vdev)
 {
        struct rte_crypto_vdev_init_params init_params = {
                RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS,
@@ -1190,8 +1443,15 @@ cryptodev_openssl_probe(const char *name,
                rte_socket_id(),
                {0}
        };
+       const char *name;
+       const char *input_args;
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       name = rte_vdev_device_name(vdev);
+       if (name == NULL)
+               return -EINVAL;
+       input_args = rte_vdev_device_args(vdev);
+
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
@@ -1203,13 +1463,16 @@ cryptodev_openssl_probe(const char *name,
        RTE_LOG(INFO, PMD, "  Max number of sessions = %d\n",
                        init_params.max_nb_sessions);
 
-       return cryptodev_openssl_create(&init_params);
+       return cryptodev_openssl_create(name, vdev, &init_params);
 }
 
 /** Uninitialise OPENSSL crypto device */
 static int
-cryptodev_openssl_remove(const char *name)
+cryptodev_openssl_remove(struct rte_vdev_device *vdev)
 {
+       const char *name;
+
+       name = rte_vdev_device_name(vdev);
        if (name == NULL)
                return -EINVAL;