Update the pkcs11.h header for missing mechanisms

diff --git a/common/attrs.c b/common/attrs.c
index f9d947e1dbfa1b7f5ef27b751ad9af206f87f60b..b123b077c34413c20dce2061aefe80cb5c5f4834 100644 (file)
--- a/common/attrs.c
+++ b/common/attrs.c
@@ -838,7 +838,7 @@ format_attribute_type (p11_buffer *buffer,
        X (CKA_BASE)
        X (CKA_PRIME_BITS)
        /* X (CKA_SUBPRIME_BITS) */
-       /* X (CKA_SUB_PRIME_BITS) */
+       X (CKA_SUB_PRIME_BITS)
        X (CKA_VALUE_BITS)
        X (CKA_VALUE_LEN)
        X (CKA_EXTRACTABLE)

diff --git a/common/pkcs11.h b/common/pkcs11.h
index 4b7efe581b19546f259887adfc9c841bdedff011..f8dc78e20885258630b82d00c46430e8a2aa7484 100644 (file)
--- a/common/pkcs11.h
+++ b/common/pkcs11.h
@@ -531,6 +531,10 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_CDMF_MAC                   (0x143UL)
 #define CKM_CDMF_MAC_GENERAL           (0x144UL)
 #define CKM_CDMF_CBC_PAD               (0x145UL)
+#define CKM_DES_OFB64                  (0x150UL)
+#define CKM_DES_OFB8                   (0x151UL)
+#define CKM_DES_CFB64                  (0x152UL)
+#define CKM_DES_CFB8                   (0x153UL)
 #define CKM_MD2                                (0x200UL)
 #define CKM_MD2_HMAC                   (0x201UL)
 #define CKM_MD2_HMAC_GENERAL           (0x202UL)
@@ -605,11 +609,15 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_TLS_MASTER_KEY_DERIVE      (0x375UL)
 #define CKM_TLS_KEY_AND_MAC_DERIVE     (0x376UL)
 #define CKM_TLS_MASTER_KEY_DERIVE_DH   (0x377UL)
+#define CKM_TLS_PRF                    (0x378UL)
 #define CKM_SSL3_MD5_MAC               (0x380UL)
 #define CKM_SSL3_SHA1_MAC              (0x381UL)
 #define CKM_MD5_KEY_DERIVATION         (0x390UL)
 #define CKM_MD2_KEY_DERIVATION         (0x391UL)
 #define CKM_SHA1_KEY_DERIVATION                (0x392UL)
+#define CKM_SHA256_KEY_DERIVATION      (0x393UL)
+#define CKM_SHA384_KEY_DERIVATION      (0x394UL)
+#define CKM_SHA512_KEY_DERIVATION      (0x395UL)
 #define CKM_PBE_MD2_DES_CBC            (0x3a0UL)
 #define CKM_PBE_MD5_DES_CBC            (0x3a1UL)
 #define CKM_PBE_MD5_CAST_CBC           (0x3a2UL)
@@ -626,8 +634,15 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_PBE_SHA1_RC2_40_CBC                (0x3abUL)
 #define CKM_PKCS5_PBKD2                        (0x3b0UL)
 #define CKM_PBA_SHA1_WITH_SHA1_HMAC    (0x3c0UL)
+#define CKM_WTLS_PRE_MASTER_KEY_GEN    (0x3d0UL)
+#define CKM_WTLS_MASTER_KEY_DERIVE     (0x3d1UL)
+#define CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC (0x3d2UL)
+#define CKM_WTLS_PRF                   (0x3d3UL)
+#define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE (0x3d4UL)
+#define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE (0x3d5UL)
 #define CKM_KEY_WRAP_LYNKS             (0x400UL)
 #define CKM_KEY_WRAP_SET_OAEP          (0x401UL)
+#define CKM_CMS_SIG                    (0x500UL)
 #define CKM_SKIPJACK_KEY_GEN           (0x1000UL)
 #define CKM_SKIPJACK_ECB64             (0x1001UL)
 #define CKM_SKIPJACK_CBC64             (0x1002UL)
@@ -669,6 +684,16 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_AES_MAC                    (0x1083UL)
 #define CKM_AES_MAC_GENERAL            (0x1084UL)
 #define CKM_AES_CBC_PAD                        (0x1085UL)
+#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_DSA_PARAMETER_GEN          (0x2000UL)
 #define CKM_DH_PKCS_PARAMETER_GEN      (0x2001UL)
 #define CKM_X9_42_DH_PARAMETER_GEN     (0x2002UL)