Add mechanisms used by SoftHSM2
/Library/OpenSC/bin/pkcs11-tool --module /usr/local/lib/softhsm/libsofthsm2.so -M will not show any more numeric mechanisms. Source: https://www.cryptsoft.com/pkcs11doc/STANDARD/include/v240e01/pkcs11t.h
This commit is contained in:
Martin Paljak
Martin Paljak
parent
3c1d425eb9
commit
c3a9837b10
|
|
@ -319,6 +319,10 @@ static enum_specs ck_mec_s[] = {
|
|||
{ CKM_DSA_KEY_PAIR_GEN , "CKM_DSA_KEY_PAIR_GEN " },
|
||||
{ CKM_DSA , "CKM_DSA " },
|
||||
{ CKM_DSA_SHA1 , "CKM_DSA_SHA1 " },
|
||||
{ CKM_DSA_SHA224 , "CKM_DSA_SHA224 " },
|
||||
{ CKM_DSA_SHA256 , "CKM_DSA_SHA256 " },
|
||||
{ CKM_DSA_SHA384 , "CKM_DSA_SHA384 " },
|
||||
{ CKM_DSA_SHA512 , "CKM_DSA_SHA512 " },
|
||||
{ CKM_DH_PKCS_KEY_PAIR_GEN , "CKM_DH_PKCS_KEY_PAIR_GEN " },
|
||||
{ CKM_DH_PKCS_DERIVE , "CKM_DH_PKCS_DERIVE " },
|
||||
{ CKM_X9_42_DH_KEY_PAIR_GEN , "CKM_X9_42_DH_KEY_PAIR_GEN " },
|
||||
|
|
@ -346,6 +350,7 @@ static enum_specs ck_mec_s[] = {
|
|||
{ CKM_DES3_MAC , "CKM_DES3_MAC " },
|
||||
{ CKM_DES3_MAC_GENERAL , "CKM_DES3_MAC_GENERAL " },
|
||||
{ CKM_DES3_CBC_PAD , "CKM_DES3_CBC_PAD " },
|
||||
{ CKM_DES3_CMAC , "CKM_DES3_CMAC " },
|
||||
{ CKM_CDMF_KEY_GEN , "CKM_CDMF_KEY_GEN " },
|
||||
{ CKM_CDMF_ECB , "CKM_CDMF_ECB " },
|
||||
{ CKM_CDMF_CBC , "CKM_CDMF_CBC " },
|
||||
|
|
@ -498,11 +503,18 @@ static enum_specs ck_mec_s[] = {
|
|||
{ CKM_AES_CTR , "CKM_AES_CTR " },
|
||||
{ CKM_AES_GCM , "CKM_AES_GCM " },
|
||||
{ CKM_AES_CCM , "CKM_AES_CCM " },
|
||||
{ CKM_AES_CMAC , "CKM_AES_CMAC " },
|
||||
{ CKM_AES_CTS , "CKM_AES_CTS " },
|
||||
{ CKM_BLOWFISH_KEY_GEN , "CKM_BLOWFISH_KEY_GEN " },
|
||||
{ CKM_BLOWFISH_CBC , "CKM_BLOWFISH_CBC " },
|
||||
{ CKM_TWOFISH_KEY_GEN , "CKM_TWOFISH_KEY_GEN " },
|
||||
{ CKM_TWOFISH_CBC , "CKM_TWOFISH_CBC " },
|
||||
{ CKM_DES_ECB_ENCRYPT_DATA , "CKM_DES_ECB_ENCRYPT_DATA " },
|
||||
{ CKM_DES_CBC_ENCRYPT_DATA , "CKM_DES_CBC_ENCRYPT_DATA " },
|
||||
{ CKM_DES3_ECB_ENCRYPT_DATA , "CKM_DES3_ECB_ENCRYPT_DATA " },
|
||||
{ CKM_DES3_CBC_ENCRYPT_DATA , "CKM_DES3_CBC_ENCRYPT_DATA " },
|
||||
{ CKM_AES_ECB_ENCRYPT_DATA , "CKM_AES_ECB_ENCRYPT_DATA " },
|
||||
{ CKM_AES_CBC_ENCRYPT_DATA , "CKM_AES_CBC_ENCRYPT_DATA " },
|
||||
{ CKM_GOSTR3410_KEY_PAIR_GEN , "CKM_GOSTR3410_KEY_PAIR_GEN " },
|
||||
{ CKM_GOSTR3410 , "CKM_GOSTR3410 " },
|
||||
{ CKM_GOSTR3410_WITH_GOSTR3411 , "CKM_GOSTR3410_WITH_GOSTR3411 " },
|
||||
|
|
@ -518,6 +530,7 @@ static enum_specs ck_mec_s[] = {
|
|||
{ CKM_DSA_PARAMETER_GEN , "CKM_DSA_PARAMETER_GEN " },
|
||||
{ CKM_DH_PKCS_PARAMETER_GEN , "CKM_DH_PKCS_PARAMETER_GEN " },
|
||||
{ CKM_X9_42_DH_PARAMETER_GEN , "CKM_X9_42_DH_PARAMETER_GEN " },
|
||||
{ CKM_AES_KEY_WRAP , "CKM_AES_KEY_WRAP " },
|
||||
{ CKM_VENDOR_DEFINED , "CKM_VENDOR_DEFINED " }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -498,6 +498,10 @@ typedef unsigned long ck_mechanism_type_t;
|
|||
#define CKM_DSA_KEY_PAIR_GEN (0x10UL)
|
||||
#define CKM_DSA (0x11UL)
|
||||
#define CKM_DSA_SHA1 (0x12UL)
|
||||
#define CKM_DSA_SHA224 (0x13UL)
|
||||
#define CKM_DSA_SHA256 (0x14UL)
|
||||
#define CKM_DSA_SHA384 (0x15UL)
|
||||
#define CKM_DSA_SHA512 (0x16UL)
|
||||
#define CKM_DH_PKCS_KEY_PAIR_GEN (0x20UL)
|
||||
#define CKM_DH_PKCS_DERIVE (0x21UL)
|
||||
#define CKM_X9_42_DH_KEY_PAIR_GEN (0x30UL)
|
||||
|
|
@ -533,6 +537,7 @@ typedef unsigned long ck_mechanism_type_t;
|
|||
#define CKM_DES3_MAC (0x134UL)
|
||||
#define CKM_DES3_MAC_GENERAL (0x135UL)
|
||||
#define CKM_DES3_CBC_PAD (0x136UL)
|
||||
#define CKM_DES3_CMAC (0x138UL)
|
||||
#define CKM_CDMF_KEY_GEN (0x140UL)
|
||||
#define CKM_CDMF_ECB (0x141UL)
|
||||
#define CKM_CDMF_CBC (0x142UL)
|
||||
|
|
@ -688,10 +693,17 @@ typedef unsigned long ck_mechanism_type_t;
|
|||
#define CKM_AES_GCM (0x1087UL)
|
||||
#define CKM_AES_CCM (0x1088UL)
|
||||
#define CKM_AES_CTS (0x1089UL)
|
||||
#define CKM_AES_CMAC (0x108AUL)
|
||||
#define CKM_BLOWFISH_KEY_GEN (0x1090UL)
|
||||
#define CKM_BLOWFISH_CBC (0x1091UL)
|
||||
#define CKM_TWOFISH_KEY_GEN (0x1092UL)
|
||||
#define CKM_TWOFISH_CBC (0x1093UL)
|
||||
#define CKM_DES_ECB_ENCRYPT_DATA (0x1100UL)
|
||||
#define CKM_DES_CBC_ENCRYPT_DATA (0x1101UL)
|
||||
#define CKM_DES3_ECB_ENCRYPT_DATA (0x1102UL)
|
||||
#define CKM_DES3_CBC_ENCRYPT_DATA (0x1103UL)
|
||||
#define CKM_AES_ECB_ENCRYPT_DATA (0x1104UL)
|
||||
#define CKM_AES_CBC_ENCRYPT_DATA (0x1105UL)
|
||||
#define CKM_GOSTR3410_KEY_PAIR_GEN (0x1200UL)
|
||||
#define CKM_GOSTR3410 (0x1201UL)
|
||||
#define CKM_GOSTR3410_WITH_GOSTR3411 (0x1202UL)
|
||||
|
|
@ -708,6 +720,7 @@ typedef unsigned long ck_mechanism_type_t;
|
|||
#define CKM_DSA_PARAMETER_GEN (0x2000UL)
|
||||
#define CKM_DH_PKCS_PARAMETER_GEN (0x2001UL)
|
||||
#define CKM_X9_42_DH_PARAMETER_GEN (0x2002UL)
|
||||
#define CKM_AES_KEY_WRAP (0x2109UL)
|
||||
#define CKM_VENDOR_DEFINED (1UL << 31)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6048,6 +6048,10 @@ static struct mech_info p11_mechanisms[] = {
|
|||
{ CKM_DSA_KEY_PAIR_GEN, "DSA-KEY-PAIR-GEN", NULL },
|
||||
{ CKM_DSA, "DSA", NULL },
|
||||
{ CKM_DSA_SHA1, "DSA-SHA1", NULL },
|
||||
{ CKM_DSA_SHA224, "DSA-SHA224", NULL },
|
||||
{ CKM_DSA_SHA256, "DSA-SHA256", NULL },
|
||||
{ CKM_DSA_SHA384, "DSA-SHA384", NULL },
|
||||
{ CKM_DSA_SHA512, "DSA-SHA512", NULL },
|
||||
{ CKM_DH_PKCS_KEY_PAIR_GEN,"DH-PKCS-KEY-PAIR-GEN", NULL },
|
||||
{ CKM_DH_PKCS_DERIVE, "DH-PKCS-DERIVE", NULL },
|
||||
{ CKM_X9_42_DH_KEY_PAIR_GEN,"X9-42-DH-KEY-PAIR-GEN", NULL },
|
||||
|
|
@ -6075,6 +6079,7 @@ static struct mech_info p11_mechanisms[] = {
|
|||
{ CKM_DES3_MAC, "DES3-MAC", NULL },
|
||||
{ CKM_DES3_MAC_GENERAL, "DES3-MAC-GENERAL", NULL },
|
||||
{ CKM_DES3_CBC_PAD, "DES3-CBC-PAD", NULL },
|
||||
{ CKM_DES3_CMAC, "DES3-CMAC", NULL },
|
||||
{ CKM_CDMF_KEY_GEN, "CDMF-KEY-GEN", NULL },
|
||||
{ CKM_CDMF_ECB, "CDMF-ECB", NULL },
|
||||
{ CKM_CDMF_CBC, "CDMF-CBC", NULL },
|
||||
|
|
@ -6213,13 +6218,24 @@ static struct mech_info p11_mechanisms[] = {
|
|||
{ CKM_AES_MAC, "AES-MAC", NULL },
|
||||
{ CKM_AES_MAC_GENERAL, "AES-MAC-GENERAL", NULL },
|
||||
{ CKM_AES_CBC_PAD, "AES-CBC-PAD", NULL },
|
||||
{ CKM_AES_CTR, "AES-CTR", NULL },
|
||||
{ CKM_AES_GCM, "AES-GCM", NULL },
|
||||
{ CKM_AES_CMAC, "AES-CMAC", NULL },
|
||||
{ CKM_DES_ECB_ENCRYPT_DATA, "DES-ECB-ENCRYPT-DATA", NULL },
|
||||
{ CKM_DES_CBC_ENCRYPT_DATA, "DES-CBC-ENCRYPT-DATA", NULL },
|
||||
{ CKM_DES3_ECB_ENCRYPT_DATA, "DES3-ECB-ENCRYPT-DATA", NULL },
|
||||
{ CKM_DES3_CBC_ENCRYPT_DATA, "DES3-CBC-ENCRYPT-DATA", NULL },
|
||||
{ CKM_AES_ECB_ENCRYPT_DATA, "AES-ECB-ENCRYPT-DATA", NULL },
|
||||
{ CKM_AES_CBC_ENCRYPT_DATA, "AES-CBC-ENCRYPT-DATA", NULL },
|
||||
{ CKM_GOSTR3410_KEY_PAIR_GEN,"GOSTR3410-KEY-PAIR-GEN", NULL },
|
||||
{ CKM_GOSTR3410, "GOSTR3410", NULL },
|
||||
{ CKM_GOSTR3410_WITH_GOSTR3411,"GOSTR3410-WITH-GOSTR3411", NULL },
|
||||
{ CKM_GOSTR3411, "GOSTR3411", NULL },
|
||||
{ CKM_GOSTR3411_HMAC, "GOSTR3411-HMAC", NULL },
|
||||
{ CKM_DSA_PARAMETER_GEN, "DSA-PARAMETER-GEN", NULL },
|
||||
{ CKM_DH_PKCS_PARAMETER_GEN,"DH-PKCS-PARAMETER-GEN", NULL },
|
||||
{ CKM_X9_42_DH_PARAMETER_GEN,"X9-42-DH-PARAMETER-GEN", NULL },
|
||||
{ CKM_AES_KEY_WRAP, "AES-KEY-WRAP", NULL},
|
||||
{ 0, NULL, NULL }
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue