giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support of additional type, mechanisms and attributes

This commit is contained in:
Mathias Brossard 2015-01-20 23:01:30 -08:00
parent 3dadd3fba1
commit 7a455f64c7
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pkcs11/pkcs11-display.c
View File

@ -275,7 +275,12 @@ static enum_specs ck_key_s[] = {
{ CKK_BATON , "CKK_BATON " },
{ CKK_JUNIPER , "CKK_JUNIPER " },
{ CKK_CDMF , "CKK_CDMF " },
{ CKK_AES , "CKK_AES " }
{ CKK_AES , "CKK_AES " },
{ CKK_BLOWFISH , "CKK_BLOWFISH " },
{ CKK_TWOFISH , "CKK_TWOFISH " },
{ CKK_GOSTR3410 , "CKK_GOSTR3410 " },
{ CKK_GOSTR3411 , "CKK_GOSTR3411 " },
{ CKK_GOST28147 , "CKK_GOST28147 " }
};
static enum_specs ck_mec_s[] = {
@ -479,6 +484,26 @@ static enum_specs ck_mec_s[] = {
{ CKM_AES_MAC , "CKM_AES_MAC " },
{ CKM_AES_MAC_GENERAL , "CKM_AES_MAC_GENERAL " },
{ CKM_AES_CBC_PAD , "CKM_AES_CBC_PAD " },
{ CKM_AES_CTR , "CKM_AES_CTR " },
{ CKM_AES_GCM , "CKM_AES_GCM " },
{ CKM_AES_CCM , "CKM_AES_CCM " },
{ 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_GOSTR3410_KEY_PAIR_GEN , "CKM_GOSTR3410_KEY_PAIR_GEN " },
{ CKM_GOSTR3410 , "CKM_GOSTR3410 " },
{ CKM_GOSTR3410_WITH_GOSTR3411 , "CKM_GOSTR3410_WITH_GOSTR3411 " },
{ CKM_GOSTR3410_KEY_WRAP , "CKM_GOSTR3410_KEY_WRAP " },
{ CKM_GOSTR3410_DERIVE , "CKM_GOSTR3410_DERIVE " },
{ CKM_GOSTR3411 , "CKM_GOSTR3411 " },
{ CKM_GOSTR3411_HMAC , "CKM_GOSTR3411_HMAC " },
{ CKM_GOST28147_KEY_GEN , "CKM_GOST28147_KEY_GEN " },
{ CKM_GOST28147_ECB , "CKM_GOST28147_ECB " },
{ CKM_GOST28147 , "CKM_GOST28147 " },
{ CKM_GOST28147_MAC , "CKM_GOST28147_MAC " },
{ CKM_GOST28147_KEY_WRAP , "CKM_GOST28147_KEY_WRAP " },
{ 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 " },
@ -682,6 +707,9 @@ type_spec ck_attribute_specs[] = {
{ CKA_WRAP_WITH_TRUSTED , "CKA_WRAP_WITH_TRUSTED ", print_generic, NULL },
{ CKA_WRAP_TEMPLATE , "CKA_WRAP_TEMPLATE ", print_generic, NULL },
{ CKA_UNWRAP_TEMPLATE , "CKA_UNWRAP_TEMPLATE ", print_generic, NULL },
{ CKA_GOSTR3410_PARAMS , "CKA_GOSTR3410_PARAMS ", print_generic, NULL },
{ CKA_GOSTR3411_PARAMS , "CKA_GOSTR3411_PARAMS ", print_generic, NULL },
{ CKA_GOST28147_PARAMS , "CKA_GOST28147_PARAMS ", print_generic, NULL },
{ CKA_HW_FEATURE_TYPE , "CKA_HW_FEATURE_TYPE ", print_generic, NULL },
{ CKA_RESET_ON_INIT , "CKA_RESET_ON_INIT ", print_generic, NULL },
{ CKA_HAS_RESET , "CKA_HAS_RESET ", print_generic, NULL },