[PATCH] cryptodev: remove deprecated algo string arrays
Hemant Agrawal
hemant.agrawal at oss.nxp.com
Mon Jul 31 08:18:25 CEST 2023
Acked-by: Hemant Agrawal<hemant.agrawal at nxp.com>
On 31-Jul-23 9:07 AM, Akhil Goyal wrote:
> Caution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
>
>
> Removed the algorithm strings arrays ``rte_crypto_cipher_algorithm_strings``,
> ``rte_crypto_auth_algorithm_strings``, ``rte_crypto_aead_algorithm_strings``
> and ``rte_crypto_asym_xform_strings``.
> Application can use the new APIs ``rte_cryptodev_get_cipher_algo_string``,
> ``rte_cryptodev_get_auth_algo_string``, ``rte_cryptodev_get_aead_algo_string``
> and ``rte_cryptodev_asym_get_xform_string`` respectively.
>
> Signed-off-by: Akhil Goyal <gakhil at marvell.com>
> ---
>
> Release notes will be updated when base patch is merged.
>
> doc/guides/rel_notes/deprecation.rst | 7 --
> lib/cryptodev/rte_crypto_asym.h | 5 --
> lib/cryptodev/rte_crypto_sym.h | 15 ----
> lib/cryptodev/rte_cryptodev.c | 108 ---------------------------
> lib/cryptodev/version.map | 4 -
> 5 files changed, 139 deletions(-)
>
> diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
> index 494b401cda..2f3738fdea 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -177,13 +177,6 @@ Deprecation Notices
> which got error interrupt to the application,
> so that application can reset that particular queue pair.
>
> -* cryptodev: The arrays of algorithm strings ``rte_crypto_cipher_algorithm_strings``,
> - ``rte_crypto_auth_algorithm_strings``, ``rte_crypto_aead_algorithm_strings`` and
> - ``rte_crypto_asym_xform_strings`` are deprecated and will be removed in DPDK 23.11.
> - Application can use the new APIs ``rte_cryptodev_get_cipher_algo_string``,
> - ``rte_cryptodev_get_auth_algo_string``, ``rte_cryptodev_get_aead_algo_string`` and
> - ``rte_cryptodev_asym_get_xform_string`` respectively.
> -
> * security: Hide structures ``rte_security_ops`` and ``rte_security_ctx``
> as these are internal to DPDK library and drivers.
>
> diff --git a/lib/cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h
> index 8b5794fb7c..6942d6df69 100644
> --- a/lib/cryptodev/rte_crypto_asym.h
> +++ b/lib/cryptodev/rte_crypto_asym.h
> @@ -29,11 +29,6 @@ extern "C" {
>
> struct rte_cryptodev_asym_session;
>
> -/** asym xform type name strings */
> -__rte_deprecated
> -extern const char *
> -rte_crypto_asym_xform_strings[];
> -
> /** asym key exchange operation type name strings */
> extern const char *
> rte_crypto_asym_ke_strings[];
> diff --git a/lib/cryptodev/rte_crypto_sym.h b/lib/cryptodev/rte_crypto_sym.h
> index 76c868c503..f49fcf5626 100644
> --- a/lib/cryptodev/rte_crypto_sym.h
> +++ b/lib/cryptodev/rte_crypto_sym.h
> @@ -180,11 +180,6 @@ enum rte_crypto_cipher_algorithm {
> /**< ShangMi 4 (SM4) algorithm in CFB mode */
> };
>
> -/** Cipher algorithm name strings */
> -__rte_deprecated
> -extern const char *
> -rte_crypto_cipher_algorithm_strings[];
> -
> /** Symmetric Cipher Direction */
> enum rte_crypto_cipher_operation {
> RTE_CRYPTO_CIPHER_OP_ENCRYPT,
> @@ -389,11 +384,6 @@ enum rte_crypto_auth_algorithm {
> /** < HMAC using ShangMi 3 (SM3) algorithm */
> };
>
> -/** Authentication algorithm name strings */
> -__rte_deprecated
> -extern const char *
> -rte_crypto_auth_algorithm_strings[];
> -
> /** Symmetric Authentication / Hash Operations */
> enum rte_crypto_auth_operation {
> RTE_CRYPTO_AUTH_OP_VERIFY, /**< Verify authentication digest */
> @@ -494,11 +484,6 @@ enum rte_crypto_aead_algorithm {
> /**< Chacha20 cipher with poly1305 authenticator */
> };
>
> -/** AEAD algorithm name strings */
> -__rte_deprecated
> -extern const char *
> -rte_crypto_aead_algorithm_strings[];
> -
> /** Symmetric AEAD Operations */
> enum rte_crypto_aead_operation {
> RTE_CRYPTO_AEAD_OP_ENCRYPT,
> diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
> index c49d342b17..0f65992444 100644
> --- a/lib/cryptodev/rte_cryptodev.c
> +++ b/lib/cryptodev/rte_cryptodev.c
> @@ -63,40 +63,6 @@ struct rte_cryptodev_callback {
> uint32_t active; /**< Callback is executing */
> };
>
> -/**
> - * @deprecated
> - * The crypto cipher algorithm strings identifiers.
> - * It could be used in application command line.
> - */
> -__rte_deprecated
> -const char *
> -rte_crypto_cipher_algorithm_strings[] = {
> - [RTE_CRYPTO_CIPHER_3DES_CBC] = "3des-cbc",
> - [RTE_CRYPTO_CIPHER_3DES_ECB] = "3des-ecb",
> - [RTE_CRYPTO_CIPHER_3DES_CTR] = "3des-ctr",
> -
> - [RTE_CRYPTO_CIPHER_AES_CBC] = "aes-cbc",
> - [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_F8] = "aes-f8",
> - [RTE_CRYPTO_CIPHER_AES_XTS] = "aes-xts",
> -
> - [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",
> - [RTE_CRYPTO_CIPHER_SNOW3G_UEA2] = "snow3g-uea2",
> - [RTE_CRYPTO_CIPHER_ZUC_EEA3] = "zuc-eea3",
> - [RTE_CRYPTO_CIPHER_SM4_ECB] = "sm4-ecb",
> - [RTE_CRYPTO_CIPHER_SM4_CBC] = "sm4-cbc",
> - [RTE_CRYPTO_CIPHER_SM4_CTR] = "sm4-ctr"
> -};
> -
> /**
> * The crypto cipher algorithm strings identifiers.
> * Not to be used in application directly.
> @@ -142,51 +108,6 @@ rte_crypto_cipher_operation_strings[] = {
> [RTE_CRYPTO_CIPHER_OP_DECRYPT] = "decrypt"
> };
>
> -/**
> - * @deprecated
> - * The crypto auth algorithm strings identifiers.
> - * It could be used in application command line.
> - */
> -__rte_deprecated
> -const char *
> -rte_crypto_auth_algorithm_strings[] = {
> - [RTE_CRYPTO_AUTH_AES_CBC_MAC] = "aes-cbc-mac",
> - [RTE_CRYPTO_AUTH_AES_CMAC] = "aes-cmac",
> - [RTE_CRYPTO_AUTH_AES_GMAC] = "aes-gmac",
> - [RTE_CRYPTO_AUTH_AES_XCBC_MAC] = "aes-xcbc-mac",
> -
> - [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",
> -
> - [RTE_CRYPTO_AUTH_SHA224] = "sha2-224",
> - [RTE_CRYPTO_AUTH_SHA224_HMAC] = "sha2-224-hmac",
> - [RTE_CRYPTO_AUTH_SHA256] = "sha2-256",
> - [RTE_CRYPTO_AUTH_SHA256_HMAC] = "sha2-256-hmac",
> - [RTE_CRYPTO_AUTH_SHA384] = "sha2-384",
> - [RTE_CRYPTO_AUTH_SHA384_HMAC] = "sha2-384-hmac",
> - [RTE_CRYPTO_AUTH_SHA512] = "sha2-512",
> - [RTE_CRYPTO_AUTH_SHA512_HMAC] = "sha2-512-hmac",
> -
> - [RTE_CRYPTO_AUTH_SHA3_224] = "sha3-224",
> - [RTE_CRYPTO_AUTH_SHA3_224_HMAC] = "sha3-224-hmac",
> - [RTE_CRYPTO_AUTH_SHA3_256] = "sha3-256",
> - [RTE_CRYPTO_AUTH_SHA3_256_HMAC] = "sha3-256-hmac",
> - [RTE_CRYPTO_AUTH_SHA3_384] = "sha3-384",
> - [RTE_CRYPTO_AUTH_SHA3_384_HMAC] = "sha3-384-hmac",
> - [RTE_CRYPTO_AUTH_SHA3_512] = "sha3-512",
> - [RTE_CRYPTO_AUTH_SHA3_512_HMAC] = "sha3-512-hmac",
> -
> - [RTE_CRYPTO_AUTH_KASUMI_F9] = "kasumi-f9",
> - [RTE_CRYPTO_AUTH_SNOW3G_UIA2] = "snow3g-uia2",
> - [RTE_CRYPTO_AUTH_ZUC_EIA3] = "zuc-eia3",
> - [RTE_CRYPTO_AUTH_SM3] = "sm3"
> -};
> -
> /**
> * The crypto auth algorithm strings identifiers.
> * Not to be used in application directly.
> @@ -235,19 +156,6 @@ crypto_auth_algorithm_strings[] = {
> [RTE_CRYPTO_AUTH_SHAKE_256] = "shake-256",
> };
>
> -/**
> - * @deprecated
> - * The crypto AEAD algorithm strings identifiers.
> - * It could be used in application command line.
> - */
> -__rte_deprecated
> -const char *
> -rte_crypto_aead_algorithm_strings[] = {
> - [RTE_CRYPTO_AEAD_AES_CCM] = "aes-ccm",
> - [RTE_CRYPTO_AEAD_AES_GCM] = "aes-gcm",
> - [RTE_CRYPTO_AEAD_CHACHA20_POLY1305] = "chacha20-poly1305"
> -};
> -
> /**
> * The crypto AEAD algorithm strings identifiers.
> * Not to be used in application directly.
> @@ -271,22 +179,6 @@ rte_crypto_aead_operation_strings[] = {
> [RTE_CRYPTO_AEAD_OP_DECRYPT] = "decrypt"
> };
>
> -/**
> - * @deprecated
> - * Asymmetric crypto transform operation strings identifiers.
> - */
> -__rte_deprecated
> -const char *rte_crypto_asym_xform_strings[] = {
> - [RTE_CRYPTO_ASYM_XFORM_NONE] = "none",
> - [RTE_CRYPTO_ASYM_XFORM_RSA] = "rsa",
> - [RTE_CRYPTO_ASYM_XFORM_MODEX] = "modexp",
> - [RTE_CRYPTO_ASYM_XFORM_MODINV] = "modinv",
> - [RTE_CRYPTO_ASYM_XFORM_DH] = "dh",
> - [RTE_CRYPTO_ASYM_XFORM_DSA] = "dsa",
> - [RTE_CRYPTO_ASYM_XFORM_ECDSA] = "ecdsa",
> - [RTE_CRYPTO_ASYM_XFORM_ECPM] = "ecpm",
> -};
> -
> /**
> * Asymmetric crypto transform operation strings identifiers.
> * Not to be used in application directly.
> diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map
> index 24ff90799c..18c32d7a20 100644
> --- a/lib/cryptodev/version.map
> +++ b/lib/cryptodev/version.map
> @@ -1,11 +1,8 @@
> DPDK_23 {
> global:
>
> - rte_crypto_aead_algorithm_strings;
> rte_crypto_aead_operation_strings;
> - rte_crypto_auth_algorithm_strings;
> rte_crypto_auth_operation_strings;
> - rte_crypto_cipher_algorithm_strings;
> rte_crypto_cipher_operation_strings;
> rte_crypto_fp_ops;
> rte_crypto_op_pool_create;
> @@ -61,7 +58,6 @@ EXPERIMENTAL {
> rte_cryptodev_sym_session_pool_create;
> rte_cryptodev_sym_session_set_user_data;
> rte_crypto_asym_op_strings;
> - rte_crypto_asym_xform_strings;
>
> # added in 20.05
> __rte_cryptodev_trace_dequeue_burst;
> --
> 2.25.1
>
More information about the dev
mailing list