diff options
| author | наб <[email protected]> | 2021-12-25 03:40:59 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-02-15 16:25:21 -0800 |
| commit | f43748f6e1997e823167bace2b75d5e9ea05256b (patch) | |
| tree | 2d5c4411dbc9a850f059e2c4276916429526afbb | |
| parent | d223af9bbc0bbb449deda4b91b0ec051a6670e2d (diff) | |
module: icp: remove algorithm name defines used only in the default mechtab
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #12901
| -rw-r--r-- | include/sys/crypto/common.h | 13 | ||||
| -rw-r--r-- | module/icp/core/kcf_mech_tabs.c | 15 |
2 files changed, 1 insertions, 27 deletions
diff --git a/include/sys/crypto/common.h b/include/sys/crypto/common.h index c1e800ef4..ff8d0a068 100644 --- a/include/sys/crypto/common.h +++ b/include/sys/crypto/common.h @@ -170,12 +170,6 @@ typedef uint32_t crypto_keysize_unit_t; /* Mechanisms supported out-of-the-box */ -#define SUN_CKM_MD5 "CKM_MD5" -#define SUN_CKM_MD5_HMAC "CKM_MD5_HMAC" -#define SUN_CKM_MD5_HMAC_GENERAL "CKM_MD5_HMAC_GENERAL" -#define SUN_CKM_SHA1 "CKM_SHA_1" -#define SUN_CKM_SHA1_HMAC "CKM_SHA_1_HMAC" -#define SUN_CKM_SHA1_HMAC_GENERAL "CKM_SHA_1_HMAC_GENERAL" #define SUN_CKM_SHA256 "CKM_SHA256" #define SUN_CKM_SHA256_HMAC "CKM_SHA256_HMAC" #define SUN_CKM_SHA256_HMAC_GENERAL "CKM_SHA256_HMAC_GENERAL" @@ -187,19 +181,12 @@ typedef uint32_t crypto_keysize_unit_t; #define SUN_CKM_SHA512_HMAC_GENERAL "CKM_SHA512_HMAC_GENERAL" #define SUN_CKM_SHA512_224 "CKM_SHA512_224" #define SUN_CKM_SHA512_256 "CKM_SHA512_256" -#define SUN_CKM_DES_CBC "CKM_DES_CBC" -#define SUN_CKM_DES3_CBC "CKM_DES3_CBC" -#define SUN_CKM_DES_ECB "CKM_DES_ECB" -#define SUN_CKM_DES3_ECB "CKM_DES3_ECB" -#define SUN_CKM_BLOWFISH_CBC "CKM_BLOWFISH_CBC" -#define SUN_CKM_BLOWFISH_ECB "CKM_BLOWFISH_ECB" #define SUN_CKM_AES_CBC "CKM_AES_CBC" #define SUN_CKM_AES_ECB "CKM_AES_ECB" #define SUN_CKM_AES_CTR "CKM_AES_CTR" #define SUN_CKM_AES_CCM "CKM_AES_CCM" #define SUN_CKM_AES_GCM "CKM_AES_GCM" #define SUN_CKM_AES_GMAC "CKM_AES_GMAC" -#define SUN_CKM_RC4 "CKM_RC4" /* Data arguments of cryptographic operations */ diff --git a/module/icp/core/kcf_mech_tabs.c b/module/icp/core/kcf_mech_tabs.c index aba3b43e8..6121042ee 100644 --- a/module/icp/core/kcf_mech_tabs.c +++ b/module/icp/core/kcf_mech_tabs.c @@ -76,26 +76,13 @@ /* RFE 4687834 Will deal with the extensibility of these tables later */ static kcf_mech_entry_t kcf_digest_mechs_tab[KCF_MAXDIGEST] = { - { SUN_CKM_MD5 }, { SUN_CKM_SHA1 }, }; static kcf_mech_entry_t kcf_cipher_mechs_tab[KCF_MAXCIPHER] = { - { SUN_CKM_DES_CBC }, - { SUN_CKM_DES3_CBC }, - { SUN_CKM_DES_ECB }, - { SUN_CKM_DES3_ECB }, - { SUN_CKM_BLOWFISH_CBC }, - { SUN_CKM_BLOWFISH_ECB }, { SUN_CKM_AES_CBC }, { SUN_CKM_AES_ECB }, - { SUN_CKM_RC4 }, -}; -static kcf_mech_entry_t kcf_mac_mechs_tab[KCF_MAXMAC] = { - { SUN_CKM_MD5_HMAC }, - { SUN_CKM_MD5_HMAC_GENERAL }, - { SUN_CKM_SHA1_HMAC }, - { SUN_CKM_SHA1_HMAC_GENERAL }, }; +static kcf_mech_entry_t kcf_mac_mechs_tab[KCF_MAXMAC]; const kcf_mech_entry_tab_t kcf_mech_tabs_tab[KCF_LAST_OPSCLASS + 1] = { {0, NULL}, /* No class zero */ |