From patchwork Mon Jul 31 03:37:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 129727 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C4EEA42F93; Mon, 31 Jul 2023 05:38:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51D6840A89; Mon, 31 Jul 2023 05:38:05 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 11EED40150 for ; Mon, 31 Jul 2023 05:38:02 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36UNSGmw021688; Sun, 30 Jul 2023 20:37:56 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=PIlFAmK8p2Ll7/PG4Glarxq1sf3ARpZq1o8aih22kQ8=; b=fboXPfJiaQWaFXTz7PSOD0eP1AjcMX7Y6IRQ9mXix0DTGAYr7ALzNb30+JvS7JH/2X5i 98zLpZqW81D7DLiG0dUXHtEiF3NcC3GD1B3wZniq5yqWJys3kDGiRJfVB5vYGvYeMC02 z33dUUOl1GSAHDYkPXPKo9c9WPupDBNKD/NJ/0Z8CnqHOj5/jKiTRSR6Iz+SiwAse2j4 lqy1Gn4YNXW3tn3sTXeL+6qZFEhWd7S3yhHYLHUzw9AV2u852tN3Wi8DXWdmOuyga4g1 F1EMsm6fXxxzPC+83WG8RChXWNHYRlgknwXbVjttZsCIuu8In0cr67un7+FFB/3tdmXh FQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3s504nm48u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sun, 30 Jul 2023 20:37:56 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Sun, 30 Jul 2023 20:37:54 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Sun, 30 Jul 2023 20:37:54 -0700 Received: from localhost.localdomain (unknown [10.28.36.102]) by maili.marvell.com (Postfix) with ESMTP id 6DC4F3F70B7; Sun, 30 Jul 2023 20:37:48 -0700 (PDT) From: Akhil Goyal To: CC: , , , , , , , , , , , , , , , , , , , Akhil Goyal Subject: [PATCH] cryptodev: remove deprecated algo string arrays Date: Mon, 31 Jul 2023 09:07:44 +0530 Message-ID: <20230731033744.926825-1-gakhil@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: qkj6oUA-_SppnwvrxUrSpsIRm4Ly3wiZ X-Proofpoint-GUID: qkj6oUA-_SppnwvrxUrSpsIRm4Ly3wiZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-27_10,2023-07-26_01,2023-05-22_02 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 Acked-by: Hemant Agrawal --- 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;