cryptodev: enable BPI for Cablelabs DOCSIS security spec

[dpdk.git] / lib / librte_cryptodev / rte_cryptodev.c

diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c
index e557e77..0ac23ed 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -126,6 +126,7 @@ rte_crypto_cipher_algorithm_strings[] = {
        [RTE_CRYPTO_CIPHER_AES_CBC]     = "aes-cbc",
        [RTE_CRYPTO_CIPHER_AES_CCM]     = "aes-ccm",
        [RTE_CRYPTO_CIPHER_AES_CTR]     = "aes-ctr",
+       [RTE_CRYPTO_CIPHER_AES_DOCSISBPI]       = "aes-docsisbpi",
        [RTE_CRYPTO_CIPHER_AES_ECB]     = "aes-ecb",
        [RTE_CRYPTO_CIPHER_AES_GCM]     = "aes-gcm",
        [RTE_CRYPTO_CIPHER_AES_F8]      = "aes-f8",
@@ -133,6 +134,9 @@ rte_crypto_cipher_algorithm_strings[] = {
 
        [RTE_CRYPTO_CIPHER_ARC4]        = "arc4",
 
+       [RTE_CRYPTO_CIPHER_DES_CBC]     = "des-cbc",
+       [RTE_CRYPTO_CIPHER_DES_DOCSISBPI]       = "des-docsisbpi",
+
        [RTE_CRYPTO_CIPHER_NULL]        = "null",
 
        [RTE_CRYPTO_CIPHER_KASUMI_F8]   = "kasumi-f8",
@@ -166,6 +170,8 @@ rte_crypto_auth_algorithm_strings[] = {
        [RTE_CRYPTO_AUTH_MD5]           = "md5",
        [RTE_CRYPTO_AUTH_MD5_HMAC]      = "md5-hmac",
 
+       [RTE_CRYPTO_AUTH_NULL]          = "null",
+
        [RTE_CRYPTO_AUTH_SHA1]          = "sha1",
        [RTE_CRYPTO_AUTH_SHA1_HMAC]     = "sha1-hmac",
 
@@ -183,6 +189,40 @@ rte_crypto_auth_algorithm_strings[] = {
        [RTE_CRYPTO_AUTH_ZUC_EIA3]      = "zuc-eia3"
 };
 
+int
+rte_cryptodev_get_cipher_algo_enum(enum rte_crypto_cipher_algorithm *algo_enum,
+               const char *algo_string)
+{
+       unsigned int i;
+
+       for (i = 1; i < RTE_DIM(rte_crypto_cipher_algorithm_strings); i++) {
+               if (strcmp(algo_string, rte_crypto_cipher_algorithm_strings[i]) == 0) {
+                       *algo_enum = (enum rte_crypto_cipher_algorithm) i;
+                       return 0;
+               }
+       }
+
+       /* Invalid string */
+       return -1;
+}
+
+int
+rte_cryptodev_get_auth_algo_enum(enum rte_crypto_auth_algorithm *algo_enum,
+               const char *algo_string)
+{
+       unsigned int i;
+
+       for (i = 1; i < RTE_DIM(rte_crypto_auth_algorithm_strings); i++) {
+               if (strcmp(algo_string, rte_crypto_auth_algorithm_strings[i]) == 0) {
+                       *algo_enum = (enum rte_crypto_auth_algorithm) i;
+                       return 0;
+               }
+       }
+
+       /* Invalid string */
+       return -1;
+}
+
 /**
  * The crypto auth operation strings identifiers.
  * It could be used in application command line.
@@ -482,34 +522,29 @@ rte_cryptodev_count_devtype(enum rte_cryptodev_type type)
        return dev_count;
 }
 
-int
+uint8_t
 rte_cryptodev_devices_get(const char *dev_name, uint8_t *devices,
        uint8_t nb_devices)
 {
-       uint8_t i, cmp, count = 0;
-       struct rte_cryptodev **devs = &rte_cryptodev_globals->devs;
-       struct rte_device *dev;
-
-       for (i = 0; i < rte_cryptodev_globals->max_devs && count < nb_devices;
-                       i++) {
+       uint8_t i, count = 0;
+       struct rte_cryptodev *devs = rte_cryptodev_globals->devs;
+       uint8_t max_devs = rte_cryptodev_globals->max_devs;
 
-               if ((*devs + i)
-                               && (*devs + i)->attached ==
-                                               RTE_CRYPTODEV_ATTACHED) {
+       for (i = 0; i < max_devs && count < nb_devices; i++) {
 
-                       dev = (*devs + i)->device;
+               if (devs[i].attached == RTE_CRYPTODEV_ATTACHED) {
+                       const struct rte_cryptodev_driver *drv = devs[i].driver;
+                       int cmp;
 
-                       if (dev)
-                               cmp = strncmp(dev->driver->name,
-                                               dev_name,
-                                               strlen(dev_name));
+                       if (drv)
+                               cmp = strncmp(drv->pci_drv.driver.name,
+                                               dev_name, strlen(dev_name));
                        else
-                               cmp = strncmp((*devs + i)->data->name,
-                                               dev_name,
-                                               strlen(dev_name));
+                               cmp = strncmp(devs[i].data->name,
+                                               dev_name, strlen(dev_name));
 
                        if (cmp == 0)
-                               devices[count++] = (*devs + i)->data->dev_id;
+                               devices[count++] = devs[i].data->dev_id;
                }
        }