Add enum names for CK_MECHANISM_TYPE constants

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
index c91655e3e5b5bfa703faa2128de20a03a4fbcf13..76c09a6b4f8df38b3b78f923bb19ec99329aaf44 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
@@ -172,6 +172,280 @@ ENUM_NEXT(ck_rv_names, CKR_FUNCTION_REJECTED, CKR_FUNCTION_REJECTED,
 ENUM_END(ck_rv_names, CKR_FUNCTION_REJECTED);
 
 
+ENUM_BEGIN(ck_mech_names, CKM_RSA_PKCS_KEY_PAIR_GEN, CKM_DSA_SHA1,
+       "RSA_PKCS_KEY_PAIR_GEN",
+       "RSA_PKCS",
+       "RSA_9796",
+       "RSA_X_509",
+       "MD2_RSA_PKCS",
+       "MD5_RSA_PKCS",
+       "SHA1_RSA_PKCS",
+       "RIPEMD128_RSA_PKCS",
+       "RIPEMD160_RSA_PKCS",
+       "RSA_PKCS_OAEP",
+       "RSA_X9_31_KEY_PAIR_GEN",
+       "RSA_X9_31",
+       "SHA1_RSA_X9_31",
+       "RSA_PKCS_PSS",
+       "SHA1_RSA_PKCS_PSS",
+       "(0xf)",
+       "DSA_KEY_PAIR_GEN",
+       "DSA",
+       "DSA_SHA1");
+ENUM_NEXT(ck_mech_names, CKM_DH_PKCS_KEY_PAIR_GEN, CKM_DH_PKCS_DERIVE,
+               CKM_DSA_SHA1,
+       "DH_PKCS_KEY_PAIR_GEN",
+       "DH_PKCS_DERIVE");
+ENUM_NEXT(ck_mech_names, CKM_X9_42_DH_KEY_PAIR_GEN, CKM_X9_42_MQV_DERIVE,
+               CKM_DH_PKCS_DERIVE,
+       "X9_42_DH_KEY_PAIR_GEN",
+       "X9_42_DH_DERIVE",
+       "X9_42_DH_HYBRID_DERIVE",
+       "X9_42_MQV_DERIVE");
+ENUM_NEXT(ck_mech_names, CKM_SHA256_RSA_PKCS, CKM_SHA512_RSA_PKCS_PSS,
+               CKM_X9_42_MQV_DERIVE,
+       "SHA256_RSA_PKCS",
+       "SHA384_RSA_PKCS",
+       "SHA512_RSA_PKCS",
+       "SHA256_RSA_PKCS_PSS",
+       "SHA384_RSA_PKCS_PSS",
+       "SHA512_RSA_PKCS_PSS");
+ENUM_NEXT(ck_mech_names, CKM_RC2_KEY_GEN, CKM_RC2_CBC_PAD,
+               CKM_SHA512_RSA_PKCS_PSS,
+       "RC2_KEY_GEN",
+       "RC2_ECB",
+       "RC2_CBC",
+       "RC2_MAC",
+       "RC2_MAC_GENERAL",
+       "RC2_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_RC4_KEY_GEN, CKM_RC4,
+               CKM_RC2_CBC_PAD,
+       "RC4_KEY_GEN",
+       "RC4");
+ENUM_NEXT(ck_mech_names, CKM_DES_KEY_GEN, CKM_DES_CBC_PAD,
+               CKM_RC4,
+       "DES_KEY_GEN",
+       "DES_ECB",
+       "DES_CBC",
+       "DES_MAC",
+       "DES_MAC_GENERAL",
+       "DES_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_DES2_KEY_GEN, CKM_DES3_CBC_PAD,
+               CKM_DES_CBC_PAD,
+       "DES2_KEY_GEN",
+       "DES3_KEY_GEN",
+       "DES3_ECB",
+       "DES3_CBC",
+       "DES3_MAC",
+       "DES3_MAC_GENERAL",
+       "DES3_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_CDMF_KEY_GEN, CKM_CDMF_CBC_PAD,
+               CKM_DES3_CBC_PAD,
+       "CDMF_KEY_GEN",
+       "CDMF_ECB",
+       "CDMF_CBC",
+       "CDMF_MAC",
+       "CDMF_MAC_GENERAL",
+       "CDMF_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_MD2, CKM_MD2_HMAC_GENERAL,
+               CKM_CDMF_CBC_PAD,
+       "MD2",
+       "MD2_HMAC",
+       "MD2_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_MD5, CKM_MD5_HMAC_GENERAL,
+               CKM_MD2_HMAC_GENERAL,
+       "MD5",
+       "MD5_HMAC",
+       "MD5_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_SHA_1, CKM_SHA_1_HMAC_GENERAL,
+               CKM_MD5_HMAC_GENERAL,
+       "SHA_1",
+       "SHA_1_HMAC",
+       "SHA_1_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_RIPEMD128, CKM_RIPEMD128_HMAC_GENERAL,
+               CKM_SHA_1_HMAC_GENERAL,
+       "RIPEMD128",
+       "RIPEMD128_HMAC",
+       "RIPEMD128_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_RIPEMD160, CKM_RIPEMD160_HMAC_GENERAL,
+               CKM_RIPEMD128_HMAC_GENERAL,
+       "RIPEMD160",
+       "RIPEMD160_HMAC",
+       "RIPEMD160_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_SHA256, CKM_SHA256_HMAC_GENERAL,
+               CKM_RIPEMD160_HMAC_GENERAL,
+       "SHA256",
+       "SHA256_HMAC",
+       "SHA256_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_SHA384, CKM_SHA384_HMAC_GENERAL,
+               CKM_SHA256_HMAC_GENERAL,
+       "SHA384",
+       "SHA384_HMAC",
+       "SHA384_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_SHA512, CKM_SHA512_HMAC_GENERAL,
+               CKM_SHA384_HMAC_GENERAL ,
+       "SHA512",
+       "SHA512_HMAC",
+       "SHA512_HMAC_GENERAL");
+ENUM_NEXT(ck_mech_names, CKM_CAST_KEY_GEN, CKM_CAST_CBC_PAD,
+               CKM_SHA512_HMAC_GENERAL,
+       "CAST_KEY_GEN",
+       "CAST_ECB",
+       "CAST_CBC",
+       "CAST_MAC",
+       "CAST_MAC_GENERAL",
+       "CAST_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_CAST3_KEY_GEN, CKM_CAST3_CBC_PAD,
+               CKM_CAST_CBC_PAD,
+       "CAST3_KEY_GEN",
+       "CAST3_ECB",
+       "CAST3_CBC",
+       "CAST3_MAC",
+       "CAST3_MAC_GENERAL",
+       "CAST3_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_CAST128_KEY_GEN, CKM_CAST128_CBC_PAD,
+               CKM_CAST3_CBC_PAD,
+       "CAST128_KEY_GEN",
+       "CAST128_ECB",
+       "CAST128_CBC",
+       "CAST128_MAC",
+       "CAST128_MAC_GENERAL",
+       "CAST128_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_RC5_KEY_GEN, CKM_RC5_CBC_PAD,
+               CKM_CAST128_CBC_PAD,
+       "RC5_KEY_GEN",
+       "RC5_ECB",
+       "RC5_CBC",
+       "RC5_MAC",
+       "RC5_MAC_GENERAL",
+       "RC5_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_IDEA_KEY_GEN, CKM_IDEA_CBC_PAD,
+               CKM_RC5_CBC_PAD,
+       "IDEA_KEY_GEN",
+       "IDEA_ECB",
+       "IDEA_CBC",
+       "IDEA_MAC",
+       "IDEA_MAC_GENERAL",
+       "IDEA_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_GENERIC_SECRET_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN,
+               CKM_IDEA_CBC_PAD,
+       "GENERIC_SECRET_KEY_GEN");
+ENUM_NEXT(ck_mech_names, CKM_CONCATENATE_BASE_AND_KEY, CKM_EXTRACT_KEY_FROM_KEY,
+               CKM_GENERIC_SECRET_KEY_GEN,
+       "CONCATENATE_BASE_AND_KEY",
+       "(0x361)",
+       "CONCATENATE_BASE_AND_DATA",
+       "CONCATENATE_DATA_AND_BASE",
+       "XOR_BASE_AND_DATA",
+       "EXTRACT_KEY_FROM_KEY");
+ENUM_NEXT(ck_mech_names, CKM_SSL3_PRE_MASTER_KEY_GEN, CKM_TLS_MASTER_KEY_DERIVE_DH,
+               CKM_EXTRACT_KEY_FROM_KEY,
+       "SSL3_PRE_MASTER_KEY_GEN",
+       "SSL3_MASTER_KEY_DERIVE",
+       "SSL3_KEY_AND_MAC_DERIVE",
+       "SSL3_MASTER_KEY_DERIVE_DH",
+       "TLS_PRE_MASTER_KEY_GEN",
+       "TLS_MASTER_KEY_DERIVE",
+       "TLS_KEY_AND_MAC_DERIVE",
+       "TLS_MASTER_KEY_DERIVE_DH");
+ENUM_NEXT(ck_mech_names, CKM_SSL3_MD5_MAC, CKM_SSL3_SHA1_MAC,
+               CKM_TLS_MASTER_KEY_DERIVE_DH,
+       "SSL3_MD5_MAC",
+       "SSL3_SHA1_MAC");
+ENUM_NEXT(ck_mech_names, CKM_MD5_KEY_DERIVATION, CKM_SHA1_KEY_DERIVATION,
+               CKM_SSL3_SHA1_MAC,
+       "MD5_KEY_DERIVATION",
+       "MD2_KEY_DERIVATION",
+       "SHA1_KEY_DERIVATION");
+ENUM_NEXT(ck_mech_names, CKM_PBE_MD2_DES_CBC, CKM_PBE_SHA1_RC2_40_CBC,
+               CKM_SHA1_KEY_DERIVATION,
+       "PBE_MD2_DES_CBC",
+       "PBE_MD5_DES_CBC",
+       "PBE_MD5_CAST_CBC",
+       "PBE_MD5_CAST3_CBC",
+       "PBE_MD5_CAST128_CBC",
+       "PBE_SHA1_CAST128_CBC",
+       "PBE_SHA1_RC4_128",
+       "PBE_SHA1_RC4_40",
+       "PBE_SHA1_DES3_EDE_CBC",
+       "PBE_SHA1_DES2_EDE_CBC",
+       "PBE_SHA1_RC2_128_CBC",
+       "PBE_SHA1_RC2_40_CBC");
+ENUM_NEXT(ck_mech_names, CKM_PKCS5_PBKD2, CKM_PKCS5_PBKD2,
+               CKM_PBE_SHA1_RC2_40_CBC,
+       "PKCS5_PBKD2");
+ENUM_NEXT(ck_mech_names, CKM_PBA_SHA1_WITH_SHA1_HMAC, CKM_PBA_SHA1_WITH_SHA1_HMAC,
+               CKM_PKCS5_PBKD2,
+       "PBA_SHA1_WITH_SHA1_HMAC");
+ENUM_NEXT(ck_mech_names, CKM_KEY_WRAP_LYNKS, CKM_KEY_WRAP_SET_OAEP,
+               CKM_PBA_SHA1_WITH_SHA1_HMAC,
+       "KEY_WRAP_LYNKS",
+       "KEY_WRAP_SET_OAEP");
+ENUM_NEXT(ck_mech_names, CKM_SKIPJACK_KEY_GEN, CKM_SKIPJACK_RELAYX,
+               CKM_KEY_WRAP_SET_OAEP,
+       "SKIPJACK_KEY_GEN",
+       "SKIPJACK_ECB64",
+       "SKIPJACK_CBC64",
+       "SKIPJACK_OFB64",
+       "SKIPJACK_CFB64",
+       "SKIPJACK_CFB32",
+       "SKIPJACK_CFB16",
+       "SKIPJACK_CFB8",
+       "SKIPJACK_WRAP",
+       "SKIPJACK_PRIVATE_WRAP",
+       "SKIPJACK_RELAYX");
+ENUM_NEXT(ck_mech_names, CKM_KEA_KEY_PAIR_GEN, CKM_KEA_KEY_DERIVE,
+               CKM_SKIPJACK_RELAYX,
+       "KEA_KEY_PAIR_GEN",
+       "KEA_KEY_DERIVE");
+ENUM_NEXT(ck_mech_names, CKM_FORTEZZA_TIMESTAMP, CKM_FORTEZZA_TIMESTAMP,
+               CKM_KEA_KEY_DERIVE,
+       "FORTEZZA_TIMESTAMP");
+ENUM_NEXT(ck_mech_names, CKM_BATON_KEY_GEN, CKM_BATON_WRAP,
+               CKM_FORTEZZA_TIMESTAMP,
+       "BATON_KEY_GEN",
+       "BATON_ECB128",
+       "BATON_ECB96",
+       "BATON_CBC128",
+       "BATON_COUNTER",
+       "BATON_SHUFFLE",
+       "BATON_WRAP");
+ENUM_NEXT(ck_mech_names, CKM_ECDSA_KEY_PAIR_GEN, CKM_ECDSA_SHA1,
+               CKM_BATON_WRAP,
+       "ECDSA_KEY_PAIR_GEN",
+       "ECDSA",
+       "ECDSA_SHA1");
+ENUM_NEXT(ck_mech_names, CKM_ECDH1_DERIVE, CKM_ECMQV_DERIVE,
+               CKM_ECDSA_SHA1,
+       "ECDH1_DERIVE",
+       "ECDH1_COFACTOR_DERIVE",
+       "ECMQV_DERIVE");
+ENUM_NEXT(ck_mech_names, CKM_JUNIPER_KEY_GEN, CKM_JUNIPER_WRAP,
+               CKM_ECMQV_DERIVE,
+       "JUNIPER_KEY_GEN",
+       "JUNIPER_ECB128",
+       "JUNIPER_CBC128",
+       "JUNIPER_COUNTER",
+       "JUNIPER_SHUFFLE",
+       "JUNIPER_WRAP");
+ENUM_NEXT(ck_mech_names, CKM_FASTHASH, CKM_FASTHASH,
+               CKM_JUNIPER_WRAP,
+       "FASTHASH");
+ENUM_NEXT(ck_mech_names, CKM_AES_KEY_GEN, CKM_AES_CBC_PAD,
+               CKM_FASTHASH,
+       "AES_KEY_GEN",
+       "AES_ECB",
+       "AES_CBC",
+       "AES_MAC",
+       "AES_MAC_GENERAL",
+       "AES_CBC_PAD");
+ENUM_NEXT(ck_mech_names, CKM_DSA_PARAMETER_GEN, CKM_X9_42_DH_PARAMETER_GEN,
+               CKM_AES_CBC_PAD,
+       "DSA_PARAMETER_GEN",
+       "DH_PKCS_PARAMETER_GEN",
+       "X9_42_DH_PARAMETER_GEN");
+ENUM_END(ck_mech_names, CKM_X9_42_DH_PARAMETER_GEN);
+
 /**
  * Private data of an pkcs11_library_t object.
  */

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
index 2309b5acb5d1437dd17dd4d77316661e8b1cb649..5a0a6bcbb81e49f198d19ae96b84e8d1dc45ec8e 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
@@ -55,6 +55,11 @@ struct pkcs11_library_t {
  */
 extern enum_name_t *ck_rv_names;
 
+/**
+ * Enum names for CK_MECHANISM_TYPE values
+ */
+extern enum_name_t *ck_mech_names;
+
 /**
  * Trim/null terminate a string returned by the varius PKCS#11 functions.
  *