1,2c1 < /* pkcs11t.h include file for PKCS #11. */ < /* $Revision: 1.10 $ */ --- > /* pkcs11t.h include file for PKCS #11 V 2.30 */ 27,28c26,27 < #define CRYPTOKI_VERSION_MINOR 20 < #define CRYPTOKI_VERSION_AMENDMENT 3 --- > #define CRYPTOKI_VERSION_MINOR 30 > #define CRYPTOKI_VERSION_AMENDMENT 0 267a267,268 > #define CKF_ERROR_STATE 0x01000000 > 407c408 < /* SecurID, HOTP, and ACTI are new for PKCS #11 v2.20 amendment 1 */ --- > /* Following are new for PKCS #11 v2.30 */ 410a412,425 > #define CKK_CAMELLIA 0x00000025 > #define CKK_ARIA 0x00000026 > #define CKK_MD5_HMAC 0x00000027 > #define CKK_SHA_1_HMAC 0x00000028 > #define CKK_RIPEMD128_HMAC 0x00000029 > #define CKK_RIPEMD160_HMAC 0x0000002A > #define CKK_SHA256_HMAC 0x0000002B > #define CKK_SHA384_HMAC 0x0000002C > #define CKK_SHA512_HMAC 0x0000002D > #define CKK_SHA224_HMAC 0x0000002E > #define CKK_SEED 0x0000002F > #define CKK_GOSTR3410 0x00000030 > #define CKK_GOSTR3411 0x00000031 > #define CKK_GOST28147 0x00000032 412,417d426 < /* Camellia is new for PKCS #11 v2.20 amendment 3 */ < #define CKK_CAMELLIA 0x00000025 < /* ARIA is new for PKCS #11 v2.20 amendment 3 */ < #define CKK_ARIA 0x00000026 < < 577a587,589 > #define CKA_GOSTR3410_PARAMS 0x00000250 > #define CKA_GOSTR3411_PARAMS 0x00000251 > #define CKA_GOST28147_PARAMS 0x00000252 679c691 < /* SHA-224 RSA mechanisms are new for PKCS #11 v2.20 amendment 3 */ --- > /* SHA-224 RSA mechanisms are new for PKCS #11 v2.30 */ 713a726,727 > #define CKM_DES3_CMAC_GENERAL 0x00000137 > #define CKM_DES3_CMAC 0x00000138 760c774 < /* SHA-224 is new for PKCS #11 v2.20 amendment 3 */ --- > /* The following are new for PKCS #11 v2.30 */ 764d777 < 771,772d783 < < /* SecurID is new for PKCS #11 v2.20 amendment 1 */ 774a786,789 > #define CKM_HOTP_KEY_GEN 0x00000290 > #define CKM_HOTP 0x00000291 > #define CKM_ACTI 0x000002A0 > #define CKM_ACTI_KEY_GEN 0x000002A1 776,783d790 < /* HOTP is new for PKCS #11 v2.20 amendment 1 */ < #define CKM_HOTP_KEY_GEN 0x00000290 < #define CKM_HOTP 0x00000291 < < /* ACTI is new for PKCS #11 v2.20 amendment 1 */ < #define CKM_ACTI 0x000002A0 < #define CKM_ACTI_KEY_GEN 0x000002A1 < 855c862 < /* SHA-224 key derivation is new for PKCS #11 v2.20 amendment 3 */ --- > /* SHA-224 key derivation is new for PKCS #11 v2.30 */ 892c899 < /* CKM_KIP mechanisms are new for PKCS #11 v2.20 amendment 2 */ --- > /* CKM_KIP mechanisms are new for PKCS #11 v2.30 */ 897c904 < /* Camellia is new for PKCS #11 v2.20 amendment 3 */ --- > /* Camellia is new for PKCS #11 v2.30 */ 908c915 < /* ARIA is new for PKCS #11 v2.20 amendment 3 */ --- > /* ARIA is new for PKCS #11 v2.30 */ 917a925,962 > /* new for PKCS #11 v2.30 */ > > #define CKM_SEED_KEY_GEN 0x00000650 > #define CKM_SEED_ECB 0x00000651 > #define CKM_SEED_CBC 0x00000652 > #define CKM_SEED_MAC 0x00000653 > #define CKM_SEED_MAC_GENERAL 0x00000654 > #define CKM_SEED_CBC_PAD 0x00000655 > #define CKM_SEED_ECB_ENCRYPT_DATA 0x00000656 > #define CKM_SEED_CBC_ENCRYPT_DATA 0x00000657 > #define CKM_AES_GCM 0x00001087 > #define CKM_AES_CCM 0x00001088 > #define CKM_AES_OFB 0x00002104 > #define CKM_AES_CFB64 0x00002105 > #define CKM_AES_CFB8 0x00002106 > #define CKM_AES_CFB128 0x00002107 > #define CKM_BLOWFISH_CBC_PAD 0x00001094 > #define CKM_TWOFISH_CBC_PAD 0x00001095 > > #define CKM_AES_KEY_WRAP 0x00001090 > #define CKM_AES_KEY_WRAP_PAD 0x00001091 > > #define CKM_RSA_PKCS_TPM_1_1 0x00004001 > #define CKM_RSA_PKCS_OAEP_TPM_1_1 0x00004002 > > #define CKM_GOSTR3410_KEY_PAIR_GEN 0x00001200 > #define CKM_GOSTR3410 0x00001201 > #define CKM_GOSTR3410_WITH_GOSTR3411 0x00001202 > #define CKM_GOSTR3410_KEY_WRAP 0x00001203 > #define CKM_GOSTR3410_DERIVE 0x00001204 > #define CKM_GOSTR3411 0x00001210 > #define CKM_GOSTR3411_HMAC 0x00001211 > #define CKM_GOST28147_KEY_GEN 0x00001220 > #define CKM_GOST28147_ECB 0x00001221 > #define CKM_GOST28147 0x00001222 > #define CKM_GOST28147_MAC 0x00001223 > #define CKM_GOST28147_KEY_WRAP 0x00001224 > 972a1018,1019 > #define CKM_AES_CMAC 0x0000108A > #define CKM_AES_CMAC_GENERAL 0x0000108B 974c1021 < /* AES counter mode is new for PKCS #11 v2.20 amendment 3 */ --- > /* AES counter mode is new for PKCS #11 v2.30 */ 975a1023 > #define CKM_AES_CTS 0x00001089 983d1030 < 1028c1075 < * CKG_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER, --- > * CKF_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER, 1193c1240 < /* The following return values are new for PKCS #11 v2.20 amendment 3 */ --- > /* The following return values are new for PKCS #11 v2.30 */ 1195a1243,1247 > #define CKR_EXCEEDED_MAX_ITERATIONS 0x000001B5 > #define CKR_FIPS_SELF_TEST_FAILED 0x000001B6 > #define CKR_LIBRARY_LOAD_FAILED 0x000001B7 > #define CKR_PIN_TOO_WEAK 0x000001B8 > #define CKR_PUBLIC_KEY_INVALID 0x000001B9 1333a1386,1394 > /* The following X9.42 DH key derivation functions are defined */ > #define CKD_SHA1_KDF_ASN1 0x00000003 > #define CKD_SHA1_KDF_CONCATENATE 0x00000004 > /* Added for V 2.30 */ > #define CKD_SHA224_KDF 0x00000005 > #define CKD_SHA256_KDF 0x00000006 > #define CKD_SHA384_KDF 0x00000007 > #define CKD_SHA512_KDF 0x00000008 > #define CKD_CPDIVERSIFY_KDF 0x00000009 1334a1396 > 1388,1392d1449 < /* The following X9.42 DH key derivation functions are defined < (besides CKD_NULL already defined : */ < #define CKD_SHA1_KDF_ASN1 0x00000003 < #define CKD_SHA1_KDF_CONCATENATE 0x00000004 < 1857a1915,1936 > > typedef struct CK_AES_GCM_PARAMS { > CK_BYTE_PTR pIv; > CK_ULONG ulIvLen; > CK_ULONG ulIvBits; > CK_BYTE_PTR pAAD; > CK_ULONG ulAADLen; > CK_ULONG ulTagBits; > } CK_AES_GCM_PARAMS; > > typedef CK_AES_GCM_PARAMS CK_PTR CK_AES_GCM_PARAMS_PTR; > > typedef struct CK_AES_CCM_PARAMS { > CK_ULONG ulDataLen; /*plaintext or ciphertext*/ > CK_BYTE_PTR pNonce; > CK_ULONG ulNonceLen; > CK_BYTE_PTR pAAD; > CK_ULONG ulAADLen; > CK_ULONG ulMACLen; > } CK_AES_CCM_PARAMS; > > typedef CK_AES_CCM_PARAMS CK_PTR CK_AES_CCM_PARAMS_PTR;