This patch adds the text of the mechanism type to the output of pkcsconf -m
output.
Old:
Mechanism #2
Mechanism: 0x131
Key Size: 24-24
Flags: 0x8001
Mechanism #3
Mechanism: 0x1
Key Size: 512-2048
Flags: 0x67B01
New:
Mechanism #2
Mechanism: 0x131 (CKM_DES3_KEY_GEN)
Key Size: 24-24
Flags: 0x8001 (CKF_HW|CKF_GENERATE)
Mechanism #3
Mechanism: 0x1 (CKM_RSA_PKCS)
Key Size: 512-2048
Flags: 0x67B01
(CKF_HW|CKF_ENCRYPT|CKF_DECRYPT|CKF_SIGN|CKF_SIGN_RECOVER|CKF_VERIFY|CKF_VERIFY_RECOVER|CKF_WRAP|CKF_UNWRAP)
Tested on s390.
signed-off-by: Kent Yoder <[email protected]>
diff --git a/usr/sbin/pkcsconf/pkcsconf.c b/usr/sbin/pkcsconf/pkcsconf.c
index 30a143a..3dff85a 100755
--- a/usr/sbin/pkcsconf/pkcsconf.c
+++ b/usr/sbin/pkcsconf/pkcsconf.c
@@ -844,6 +844,39 @@ get_slot_list(int cond, CK_CHAR_PTR slot){
return CKR_OK;
}
+void
+display_mechanism_name(CK_MECHANISM_TYPE mech)
+{
+ CK_ULONG i;
+
+ for (i = 0; pkcs11_mech_list[i].name; i++) {
+ if (pkcs11_mech_list[i].mech == mech) {
+ printf("(%s)", pkcs11_mech_list[i].name);
+ }
+ }
+}
+
+void
+display_mechanism_flags(CK_FLAGS flags)
+{
+ CK_ULONG i, firsties = 1;
+
+ for (i = 0; pkcs11_mech_flags[i].name; i++) {
+ if (pkcs11_mech_flags[i].flag & flags) {
+ if (firsties) {
+ printf("(");
+ firsties = 0;
+ }
+
+ printf("%s|", pkcs11_mech_flags[i].name);
+ }
+ }
+
+ if (!firsties) {
+ printf(")");
+ }
+}
+
CK_RV
display_mechanism_info(void){
CK_RV rc; // Return Code
@@ -885,10 +918,17 @@ display_mechanism_info(void){
return rc;
}
printf(PKCSINIT_MSG(MECH, "Mechanism #%d\n"), lcv2);
- printf(PKCSINIT_MSG(MECHLABEL, "\tMechanism: 0x%X\n"),
MechanismList[lcv2]);
+ printf(PKCSINIT_MSG(MECHLABEL, "\tMechanism: 0x%X "),
MechanismList[lcv2]);
+
+ display_mechanism_name(MechanismList[lcv2]);
+ printf("\n");
+
printf(PKCSINIT_MSG(KEYSIZE, "\tKey Size: %d-%d\n"),
MechanismInfo.ulMinKeySize,
MechanismInfo.ulMaxKeySize);
- printf(PKCSINIT_MSG(FLAGS, "\tFlags: 0x%X\n"), MechanismInfo.flags);
+ printf(PKCSINIT_MSG(FLAGS, "\tFlags: 0x%X "), MechanismInfo.flags);
+
+ display_mechanism_flags(MechanismInfo.flags);
+ printf("\n");
}
/* Free the memory we allocated for the mechanism list */
diff --git a/usr/sbin/pkcsconf/pkcsconf_msg.h b/usr/sbin/pkcsconf/pkcsconf_msg.h
index 1ca9c04..efeb42e 100755
--- a/usr/sbin/pkcsconf/pkcsconf_msg.h
+++ b/usr/sbin/pkcsconf/pkcsconf_msg.h
@@ -378,4 +378,239 @@
#define USAGE7 68
#define USAGE8 69
#define USAGE9 70
+
+
+
+/* list of mechanism flags and their printable string names */
+struct _pkcs11_mech_flags {
+ char *name;
+ CK_FLAGS flag;
+} pkcs11_mech_flags[] = {
+ { "CKF_HW", 0x00000001 },
+ { "CKF_ENCRYPT", 0x00000100 },
+ { "CKF_DECRYPT", 0x00000200 },
+ { "CKF_DIGEST", 0x00000400 },
+ { "CKF_SIGN", 0x00000800 },
+ { "CKF_SIGN_RECOVER", 0x00001000 },
+ { "CKF_VERIFY", 0x00002000 },
+ { "CKF_VERIFY_RECOVER", 0x00004000 },
+ { "CKF_GENERATE", 0x00008000 },
+ { "CKF_GENERATE_KEY_PAIR", 0x00010000 },
+ { "CKF_WRAP", 0x00020000 },
+ { "CKF_UNWRAP", 0x00040000 },
+ { "CKF_DERIVE", 0x00080000 },
+ { "CKF_EC_F_P", 0x00100000 },
+ { "CKF_EC_F_2M", 0x00200000 },
+ { "CKF_EC_ECPARAMETERS", 0x00400000 },
+ { "CKF_EC_NAMEDCURVE", 0x00800000 },
+ { "CKF_EC_UNCOMPRESS", 0x01000000 },
+ { "CKF_EC_COMPRESS", 0x02000000 },
+ { "CKF_EXTENSION", 0x80000000 },
+ { NULL_PTR, 0xFFFFFFFF }
+};
+
+
+/* list of mechanisms and their printable string names */
+struct _pkcs11_mech_list {
+ char *name;
+ CK_MECHANISM_TYPE mech;
+} pkcs11_mech_list[] = {
+ { "CKM_RSA_PKCS_KEY_PAIR_GEN", 0x00000000 },
+ { "CKM_RSA_PKCS", 0x00000001 },
+ { "CKM_RSA_9796", 0x00000002 },
+ { "CKM_RSA_X_509", 0x00000003 },
+ { "CKM_MD2_RSA_PKCS", 0x00000004 },
+ { "CKM_MD5_RSA_PKCS", 0x00000005 },
+ { "CKM_SHA1_RSA_PKCS", 0x00000006 },
+ { "CKM_RIPEMD128_RSA_PKCS", 0x00000007 },
+ { "CKM_RIPEMD160_RSA_PKCS", 0x00000008 },
+ { "CKM_RSA_PKCS_OAEP", 0x00000009 },
+ { "CKM_RSA_X9_31_KEY_PAIR_GEN", 0x0000000A },
+ { "CKM_RSA_X9_31", 0x0000000B },
+ { "CKM_SHA1_RSA_X9_31", 0x0000000C },
+ { "CKM_RSA_PKCS_PSS", 0x0000000D },
+ { "CKM_SHA1_RSA_PKCS_PSS", 0x0000000E },
+ { "CKM_DSA_KEY_PAIR_GEN", 0x00000010 },
+ { "CKM_DSA", 0x00000011 },
+ { "CKM_DSA_SHA1", 0x00000012 },
+ { "CKM_DH_PKCS_KEY_PAIR_GEN", 0x00000020 },
+ { "CKM_DH_PKCS_DERIVE", 0x00000021 },
+ { "CKM_X9_42_DH_KEY_PAIR_GEN", 0x00000030 },
+ { "CKM_X9_42_DH_DERIVE", 0x00000031 },
+ { "CKM_X9_42_DH_HYBRID_DERIVE", 0x00000032 },
+ { "CKM_X9_42_MQV_DERIVE", 0x00000033 },
+ { "CKM_SHA256_RSA_PKCS", 0x00000043 },
+ { "CKM_RC2_KEY_GEN", 0x00000100 },
+ { "CKM_RC2_ECB", 0x00000101 },
+ { "CKM_RC2_CBC", 0x00000102 },
+ { "CKM_RC2_MAC", 0x00000103 },
+ { "CKM_RC2_MAC_GENERAL", 0x00000104 },
+ { "CKM_RC2_CBC_PAD", 0x00000105 },
+ { "CKM_RC4_KEY_GEN", 0x00000110 },
+ { "CKM_RC4", 0x00000111 },
+ { "CKM_DES_KEY_GEN", 0x00000120 },
+ { "CKM_DES_ECB", 0x00000121 },
+ { "CKM_DES_CBC", 0x00000122 },
+ { "CKM_DES_MAC", 0x00000123 },
+ { "CKM_DES_MAC_GENERAL", 0x00000124 },
+ { "CKM_DES_CBC_PAD", 0x00000125 },
+ { "CKM_DES2_KEY_GEN", 0x00000130 },
+ { "CKM_DES3_KEY_GEN", 0x00000131 },
+ { "CKM_DES3_ECB", 0x00000132 },
+ { "CKM_DES3_CBC", 0x00000133 },
+ { "CKM_DES3_MAC", 0x00000134 },
+ { "CKM_DES3_MAC_GENERAL", 0x00000135 },
+ { "CKM_DES3_CBC_PAD", 0x00000136 },
+ { "CKM_CDMF_KEY_GEN", 0x00000140 },
+ { "CKM_CDMF_ECB", 0x00000141 },
+ { "CKM_CDMF_CBC", 0x00000142 },
+ { "CKM_CDMF_MAC", 0x00000143 },
+ { "CKM_CDMF_MAC_GENERAL", 0x00000144 },
+ { "CKM_CDMF_CBC_PAD", 0x00000145 },
+ { "CKM_MD2", 0x00000200 },
+ { "CKM_MD2_HMAC", 0x00000201 },
+ { "CKM_MD2_HMAC_GENERAL", 0x00000202 },
+ { "CKM_MD5", 0x00000210 },
+ { "CKM_MD5_HMAC", 0x00000211 },
+ { "CKM_MD5_HMAC_GENERAL", 0x00000212 },
+ { "CKM_SHA_1", 0x00000220 },
+ { "CKM_SHA_1_HMAC", 0x00000221 },
+ { "CKM_SHA_1_HMAC_GENERAL", 0x00000222 },
+ { "CKM_RIPEMD128", 0x00000230 },
+ { "CKM_RIPEMD128_HMAC", 0x00000231 },
+ { "CKM_RIPEMD128_HMAC_GENERAL", 0x00000232 },
+ { "CKM_RIPEMD160", 0x00000240 },
+ { "CKM_RIPEMD160_HMAC", 0x00000241 },
+ { "CKM_RIPEMD160_HMAC_GENERAL", 0x00000242 },
+ { "CKM_SHA256", 0x00000250 },
+ { "CKM_SHA256_HMAC", 0x00000251 },
+ { "CKM_SHA256_HMAC_GENERAL", 0x00000252 },
+ { "CKM_SHA384", 0x00000260 },
+ { "CKM_SHA384_HMAC", 0x00000261 },
+ { "CKM_SHA384_HMAC_GENERAL", 0x00000262 },
+ { "CKM_SHA512", 0x00000270 },
+ { "CKM_SHA512_HMAC", 0x00000271 },
+ { "CKM_SHA512_HMAC_GENERAL", 0x00000272 },
+ { "CKM_CAST_KEY_GEN", 0x00000300 },
+ { "CKM_CAST_ECB", 0x00000301 },
+ { "CKM_CAST_CBC", 0x00000302 },
+ { "CKM_CAST_MAC", 0x00000303 },
+ { "CKM_CAST_MAC_GENERAL", 0x00000304 },
+ { "CKM_CAST_CBC_PAD", 0x00000305 },
+ { "CKM_CAST3_KEY_GEN", 0x00000310 },
+ { "CKM_CAST3_ECB", 0x00000311 },
+ { "CKM_CAST3_CBC", 0x00000312 },
+ { "CKM_CAST3_MAC", 0x00000313 },
+ { "CKM_CAST3_MAC_GENERAL", 0x00000314 },
+ { "CKM_CAST3_CBC_PAD", 0x00000315 },
+ { "CKM_CAST5_KEY_GEN", 0x00000320 },
+ { "CKM_CAST128_KEY_GEN", 0x00000320 },
+ { "CKM_CAST5_ECB", 0x00000321 },
+ { "CKM_CAST128_ECB", 0x00000321 },
+ { "CKM_CAST5_CBC", 0x00000322 },
+ { "CKM_CAST128_CBC", 0x00000322 },
+ { "CKM_CAST5_MAC", 0x00000323 },
+ { "CKM_CAST128_MAC", 0x00000323 },
+ { "CKM_CAST5_MAC_GENERAL", 0x00000324 },
+ { "CKM_CAST128_MAC_GENERAL", 0x00000324 },
+ { "CKM_CAST5_CBC_PAD", 0x00000325 },
+ { "CKM_CAST128_CBC_PAD", 0x00000325 },
+ { "CKM_RC5_KEY_GEN", 0x00000330 },
+ { "CKM_RC5_ECB", 0x00000331 },
+ { "CKM_RC5_CBC", 0x00000332 },
+ { "CKM_RC5_MAC", 0x00000333 },
+ { "CKM_RC5_MAC_GENERAL", 0x00000334 },
+ { "CKM_RC5_CBC_PAD", 0x00000335 },
+ { "CKM_IDEA_KEY_GEN", 0x00000340 },
+ { "CKM_IDEA_ECB", 0x00000341 },
+ { "CKM_IDEA_CBC", 0x00000342 },
+ { "CKM_IDEA_MAC", 0x00000343 },
+ { "CKM_IDEA_MAC_GENERAL", 0x00000344 },
+ { "CKM_IDEA_CBC_PAD", 0x00000345 },
+ { "CKM_GENERIC_SECRET_KEY_GEN", 0x00000350 },
+ { "CKM_CONCATENATE_BASE_AND_KEY", 0x00000360 },
+ { "CKM_CONCATENATE_BASE_AND_DATA", 0x00000362 },
+ { "CKM_CONCATENATE_DATA_AND_BASE", 0x00000363 },
+ { "CKM_XOR_BASE_AND_DATA", 0x00000364 },
+ { "CKM_EXTRACT_KEY_FROM_KEY", 0x00000365 },
+ { "CKM_SSL3_PRE_MASTER_KEY_GEN", 0x00000370 },
+ { "CKM_SSL3_MASTER_KEY_DERIVE", 0x00000371 },
+ { "CKM_SSL3_KEY_AND_MAC_DERIVE", 0x00000372 },
+ { "CKM_SSL3_MASTER_KEY_DERIVE_DH", 0x00000373 },
+ { "CKM_TLS_PRE_MASTER_KEY_GEN", 0x00000374 },
+ { "CKM_TLS_MASTER_KEY_DERIVE", 0x00000375 },
+ { "CKM_TLS_KEY_AND_MAC_DERIVE", 0x00000376 },
+ { "CKM_TLS_MASTER_KEY_DERIVE_DH", 0x00000377 },
+ { "CKM_SSL3_MD5_MAC", 0x00000380 },
+ { "CKM_SSL3_SHA1_MAC", 0x00000381 },
+ { "CKM_MD5_KEY_DERIVATION", 0x00000390 },
+ { "CKM_MD2_KEY_DERIVATION", 0x00000391 },
+ { "CKM_SHA1_KEY_DERIVATION", 0x00000392 },
+ { "CKM_SHA256_KEY_DERIVATION", 0x00000393 },
+ { "CKM_PBE_MD2_DES_CBC", 0x000003A0 },
+ { "CKM_PBE_MD5_DES_CBC", 0x000003A1 },
+ { "CKM_PBE_MD5_CAST_CBC", 0x000003A2 },
+ { "CKM_PBE_MD5_CAST3_CBC", 0x000003A3 },
+ { "CKM_PBE_MD5_CAST5_CBC", 0x000003A4 },
+ { "CKM_PBE_MD5_CAST128_CBC", 0x000003A4 },
+ { "CKM_PBE_SHA1_CAST5_CBC", 0x000003A5 },
+ { "CKM_PBE_SHA1_CAST128_CBC", 0x000003A5 },
+ { "CKM_PBE_SHA1_RC4_128", 0x000003A6 },
+ { "CKM_PBE_SHA1_RC4_40", 0x000003A7 },
+ { "CKM_PBE_SHA1_DES3_EDE_CBC", 0x000003A8 },
+ { "CKM_PBE_SHA1_DES2_EDE_CBC", 0x000003A9 },
+ { "CKM_PBE_SHA1_RC2_128_CBC", 0x000003AA },
+ { "CKM_PBE_SHA1_RC2_40_CBC", 0x000003AB },
+ { "CKM_PKCS5_PBKD2", 0x000003B0 },
+ { "CKM_PBA_SHA1_WITH_SHA1_HMAC", 0x000003C0 },
+ { "CKM_KEY_WRAP_LYNKS", 0x00000400 },
+ { "CKM_KEY_WRAP_SET_OAEP", 0x00000401 },
+ { "CKM_SKIPJACK_KEY_GEN", 0x00001000 },
+ { "CKM_SKIPJACK_ECB64", 0x00001001 },
+ { "CKM_SKIPJACK_CBC64", 0x00001002 },
+ { "CKM_SKIPJACK_OFB64", 0x00001003 },
+ { "CKM_SKIPJACK_CFB64", 0x00001004 },
+ { "CKM_SKIPJACK_CFB32", 0x00001005 },
+ { "CKM_SKIPJACK_CFB16", 0x00001006 },
+ { "CKM_SKIPJACK_CFB8", 0x00001007 },
+ { "CKM_SKIPJACK_WRAP", 0x00001008 },
+ { "CKM_SKIPJACK_PRIVATE_WRAP", 0x00001009 },
+ { "CKM_SKIPJACK_RELAYX", 0x0000100a },
+ { "CKM_KEA_KEY_PAIR_GEN", 0x00001010 },
+ { "CKM_KEA_KEY_DERIVE", 0x00001011 },
+ { "CKM_FORTEZZA_TIMESTAMP", 0x00001020 },
+ { "CKM_BATON_KEY_GEN", 0x00001030 },
+ { "CKM_BATON_ECB128", 0x00001031 },
+ { "CKM_BATON_ECB96", 0x00001032 },
+ { "CKM_BATON_CBC128", 0x00001033 },
+ { "CKM_BATON_COUNTER", 0x00001034 },
+ { "CKM_BATON_SHUFFLE", 0x00001035 },
+ { "CKM_BATON_WRAP", 0x00001036 },
+ { "CKM_ECDSA_KEY_PAIR_GEN", 0x00001040 },
+ { "CKM_EC_KEY_PAIR_GEN", 0x00001040 },
+ { "CKM_ECDSA", 0x00001041 },
+ { "CKM_ECDSA_SHA1", 0x00001042 },
+ { "CKM_ECDH1_DERIVE", 0x00001050 },
+ { "CKM_ECDH1_COFACTOR_DERIVE", 0x00001051 },
+ { "CKM_ECMQV_DERIVE", 0x00001052 },
+ { "CKM_JUNIPER_KEY_GEN", 0x00001060 },
+ { "CKM_JUNIPER_ECB128", 0x00001061 },
+ { "CKM_JUNIPER_CBC128", 0x00001062 },
+ { "CKM_JUNIPER_COUNTER", 0x00001063 },
+ { "CKM_JUNIPER_SHUFFLE", 0x00001064 },
+ { "CKM_JUNIPER_WRAP", 0x00001065 },
+ { "CKM_FASTHASH", 0x00001070 },
+ { "CKM_AES_KEY_GEN", 0x00001080 },
+ { "CKM_AES_ECB", 0x00001081 },
+ { "CKM_AES_CBC", 0x00001082 },
+ { "CKM_AES_MAC", 0x00001083 },
+ { "CKM_AES_MAC_GENERAL", 0x00001084 },
+ { "CKM_AES_CBC_PAD", 0x00001085 },
+ { "CKM_DSA_PARAMETER_GEN", 0x00002000 },
+ { "CKM_DH_PKCS_PARAMETER_GEN", 0x00002001 },
+ { "CKM_X9_42_DH_PARAMETER_GEN", 0x00002002 },
+ { "CKM_VENDOR_DEFINED", 0x80000000 },
+ { NULL_PTR, 0xFFFFFFFF }
+};
+
#endif
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
