--- parse-v220.txt	2015-11-09 15:59:42.227204165 +1000
+++ parse-dina.txt	2015-11-09 15:59:42.268204161 +1000
@@ -16,9 +16,12 @@
 CKA_CLASS 0x00000000
 CKA_COEFFICIENT 0x00000128
 CKA_COLOR 0x00000405
+CKA_COPYABLE 0x00000171
 CKA_DECRYPT 0x00000105
 CKA_DEFAULT_CMS_ATTRIBUTES 0x00000502
 CKA_DERIVE 0x0000010C
+CKA_DERIVE_TEMPLATE (CKF_ARRAY_ATTRIBUTE|0x00000213)
+CKA_DESTROYABLE 0x00000172
 CKA_ECDSA_PARAMS 0x00000180
 CKA_EC_PARAMS 0x00000180
 CKA_EC_POINT 0x00000181
@@ -28,6 +31,9 @@
 CKA_EXPONENT_1 0x00000126
 CKA_EXPONENT_2 0x00000127
 CKA_EXTRACTABLE 0x00000162
+CKA_GOST28147_PARAMS 0x00000252
+CKA_GOSTR3410_PARAMS 0x00000250
+CKA_GOSTR3411_PARAMS 0x00000251
 CKA_HASH_OF_ISSUER_PUBLIC_KEY 0x0000008B
 CKA_HASH_OF_SUBJECT_PUBLIC_KEY 0x0000008A
 CKA_HAS_RESET 0x00000302
@@ -44,6 +50,7 @@
 CKA_MODIFIABLE 0x00000170
 CKA_MODULUS 0x00000120
 CKA_MODULUS_BITS 0x00000121
+CKA_NAME_HASH_ALGORITHM 0x0000008C
 CKA_NEVER_EXTRACTABLE 0x00000164
 CKA_OBJECT_ID 0x00000012
 CKA_OTP_CHALLENGE_REQUIREMENT 0x00000224
@@ -70,6 +77,7 @@
 CKA_PRIVATE 0x00000002
 CKA_PRIVATE_EXPONENT 0x00000123
 CKA_PUBLIC_EXPONENT 0x00000122
+CKA_PUBLIC_KEY_INFO 0x00000129
 CKA_REQUIRED_CMS_ATTRIBUTES 0x00000501
 CKA_RESET_ON_INIT 0x00000301
 CKA_RESOLUTION 0x00000402
@@ -100,10 +108,15 @@
 CKC_WTLS 0x00000002
 CKC_X_509 0x00000000
 CKC_X_509_ATTR_CERT 0x00000001
+CKD_CPDIVERSIFY_KDF 0x00000009
 CKD_NULL 0x00000001
 CKD_SHA1_KDF 0x00000002
 CKD_SHA1_KDF_ASN1 0x00000003
 CKD_SHA1_KDF_CONCATENATE 0x00000004
+CKD_SHA224_KDF 0x00000005
+CKD_SHA256_KDF 0x00000006
+CKD_SHA384_KDF 0x00000007
+CKD_SHA512_KDF 0x00000008
 CKF_ARRAY_ATTRIBUTE 0x40000000
 CKF_CLOCK_ON_TOKEN 0x00000040
 CKF_DECRYPT 0x00000200
@@ -118,6 +131,7 @@
 CKF_EC_NAMEDCURVE 0x00800000
 CKF_EC_UNCOMPRESS 0x01000000
 CKF_ENCRYPT 0x00000100
+CKF_ERROR_STATE 0x01000000
 CKF_EXCLUDE_CHALLENGE 0x00000008
 CKF_EXCLUDE_COUNTER 0x00000004
 CKF_EXCLUDE_PIN 0x00000010
@@ -184,15 +198,27 @@
 CKK_EC 0x00000003
 CKK_ECDSA 0x00000003
 CKK_GENERIC_SECRET 0x00000010
+CKK_GOST28147 0x00000032
+CKK_GOSTR3410 0x00000030
+CKK_GOSTR3411 0x00000031
 CKK_HOTP 0x00000023
 CKK_IDEA 0x0000001A
 CKK_JUNIPER 0x0000001D
 CKK_KEA 0x00000005
+CKK_MD5_HMAC 0x00000027
 CKK_RC2 0x00000011
 CKK_RC4 0x00000012
 CKK_RC5 0x00000019
+CKK_RIPEMD128_HMAC 0x00000029
+CKK_RIPEMD160_HMAC 0x0000002A
 CKK_RSA 0x00000000
 CKK_SECURID 0x00000022
+CKK_SEED 0x0000002F
+CKK_SHA224_HMAC 0x0000002E
+CKK_SHA256_HMAC 0x0000002B
+CKK_SHA384_HMAC 0x0000002C
+CKK_SHA512_HMAC 0x0000002D
+CKK_SHA_1_HMAC 0x00000028
 CKK_SKIPJACK 0x0000001B
 CKK_TWOFISH 0x00000021
 CKK_X9_42_DH 0x00000004
@@ -201,12 +227,27 @@
 CKM_AES_CBC 0x00001082
 CKM_AES_CBC_ENCRYPT_DATA 0x00001105
 CKM_AES_CBC_PAD 0x00001085
+CKM_AES_CCM 0x00001088
+CKM_AES_CFB1 0x00002108
+CKM_AES_CFB128 0x00002107
+CKM_AES_CFB64 0x00002105
+CKM_AES_CFB8 0x00002106
+CKM_AES_CMAC 0x0000108A
+CKM_AES_CMAC_GENERAL 0x0000108B
 CKM_AES_CTR 0x00001086
+CKM_AES_CTS 0x00001089
 CKM_AES_ECB 0x00001081
 CKM_AES_ECB_ENCRYPT_DATA 0x00001104
+CKM_AES_GCM 0x00001087
+CKM_AES_GMAC 0x0000108E
 CKM_AES_KEY_GEN 0x00001080
+CKM_AES_KEY_WRAP 0x00002109
+CKM_AES_KEY_WRAP_PAD 0x0000210A
 CKM_AES_MAC 0x00001083
 CKM_AES_MAC_GENERAL 0x00001084
+CKM_AES_OFB 0x00002104
+CKM_AES_XCBC_MAC 0x0000108C
+CKM_AES_XCBC_MAC_96 0x0000108D
 CKM_ARIA_CBC 0x00000562
 CKM_ARIA_CBC_ENCRYPT_DATA 0x00000567
 CKM_ARIA_CBC_PAD 0x00000565
@@ -223,6 +264,7 @@
 CKM_BATON_SHUFFLE 0x00001035
 CKM_BATON_WRAP 0x00001036
 CKM_BLOWFISH_CBC 0x00001091
+CKM_BLOWFISH_CBC_PAD 0x00001094
 CKM_BLOWFISH_KEY_GEN 0x00001090
 CKM_CAMELLIA_CBC 0x00000552
 CKM_CAMELLIA_CBC_ENCRYPT_DATA 0x00000557
@@ -271,6 +313,8 @@
 CKM_DES3_CBC 0x00000133
 CKM_DES3_CBC_ENCRYPT_DATA 0x00001103
 CKM_DES3_CBC_PAD 0x00000136
+CKM_DES3_CMAC 0x00000138
+CKM_DES3_CMAC_GENERAL 0x00000137
 CKM_DES3_ECB 0x00000132
 CKM_DES3_ECB_ENCRYPT_DATA 0x00001102
 CKM_DES3_KEY_GEN 0x00000131
@@ -294,18 +338,41 @@
 CKM_DSA 0x00000011
 CKM_DSA_KEY_PAIR_GEN 0x00000010
 CKM_DSA_PARAMETER_GEN 0x00002000
+CKM_DSA_PROBABLISTIC_PARAMETER_GEN 0x00002003
 CKM_DSA_SHA1 0x00000012
+CKM_DSA_SHA224 0x00000013
+CKM_DSA_SHA256 0x00000014
+CKM_DSA_SHA384 0x00000015
+CKM_DSA_SHA512 0x00000016
+CKM_DSA_SHAWE_TAYLOR_PARAMETER_GEN 0x00002004
 CKM_ECDH1_COFACTOR_DERIVE 0x00001051
 CKM_ECDH1_DERIVE 0x00001050
+CKM_ECDH_AES_KEY_WRAP 0x00001053
 CKM_ECDSA 0x00001041
 CKM_ECDSA_KEY_PAIR_GEN 0x00001040
 CKM_ECDSA_SHA1 0x00001042
+CKM_ECDSA_SHA224 0x00001043
+CKM_ECDSA_SHA256 0x00001044
+CKM_ECDSA_SHA384 0x00001045
+CKM_ECDSA_SHA512 0x00001046
 CKM_ECMQV_DERIVE 0x00001052
 CKM_EC_KEY_PAIR_GEN 0x00001040
 CKM_EXTRACT_KEY_FROM_KEY 0x00000365
 CKM_FASTHASH 0x00001070
 CKM_FORTEZZA_TIMESTAMP 0x00001020
 CKM_GENERIC_SECRET_KEY_GEN 0x00000350
+CKM_GOST28147 0x00001222
+CKM_GOST28147_ECB 0x00001221
+CKM_GOST28147_KEY_GEN 0x00001220
+CKM_GOST28147_KEY_WRAP 0x00001224
+CKM_GOST28147_MAC 0x00001223
+CKM_GOSTR3410 0x00001201
+CKM_GOSTR3410_DERIVE 0x00001204
+CKM_GOSTR3410_KEY_PAIR_GEN 0x00001200
+CKM_GOSTR3410_KEY_WRAP 0x00001203
+CKM_GOSTR3410_WITH_GOSTR3411 0x00001202
+CKM_GOSTR3411 0x00001210
+CKM_GOSTR3411_HMAC 0x00001211
 CKM_HOTP 0x00000291
 CKM_HOTP_KEY_GEN 0x00000290
 CKM_IDEA_CBC 0x00000342
@@ -320,6 +387,7 @@
 CKM_JUNIPER_KEY_GEN 0x00001060
 CKM_JUNIPER_SHUFFLE 0x00001064
 CKM_JUNIPER_WRAP 0x00001065
+CKM_KEA_DERIVE 0x00001012
 CKM_KEA_KEY_DERIVE 0x00001011
 CKM_KEA_KEY_PAIR_GEN 0x00001010
 CKM_KEY_WRAP_LYNKS 0x00000400
@@ -376,15 +444,26 @@
 CKM_RIPEMD160_HMAC_GENERAL 0x00000242
 CKM_RIPEMD160_RSA_PKCS 0x00000008
 CKM_RSA_9796 0x00000002
+CKM_RSA_AES_KEY_WRAP 0x00001054
 CKM_RSA_PKCS 0x00000001
 CKM_RSA_PKCS_KEY_PAIR_GEN 0x00000000
 CKM_RSA_PKCS_OAEP 0x00000009
+CKM_RSA_PKCS_OAEP_TPM_1_1 0x00004002
 CKM_RSA_PKCS_PSS 0x0000000D
+CKM_RSA_PKCS_TPM_1_1 0x00004001
 CKM_RSA_X9_31 0x0000000B
 CKM_RSA_X9_31_KEY_PAIR_GEN 0x0000000A
 CKM_RSA_X_509 0x00000003
 CKM_SECURID 0x00000282
 CKM_SECURID_KEY_GEN 0x00000280
+CKM_SEED_CBC 0x00000652
+CKM_SEED_CBC_ENCRYPT_DATA 0x00000657
+CKM_SEED_CBC_PAD 0x00000655
+CKM_SEED_ECB 0x00000651
+CKM_SEED_ECB_ENCRYPT_DATA 0x00000656
+CKM_SEED_KEY_GEN 0x00000650
+CKM_SEED_MAC 0x00000653
+CKM_SEED_MAC_GENERAL 0x00000654
 CKM_SHA1_KEY_DERIVATION 0x00000392
 CKM_SHA1_RSA_PKCS 0x00000006
 CKM_SHA1_RSA_PKCS_PSS 0x0000000E
@@ -408,11 +487,23 @@
 CKM_SHA384_RSA_PKCS 0x00000041
 CKM_SHA384_RSA_PKCS_PSS 0x00000044
 CKM_SHA512 0x00000270
+CKM_SHA512_224 0x00000048
+CKM_SHA512_224_HMAC 0x00000049
+CKM_SHA512_224_HMAC_GENERAL 0x0000004A
+CKM_SHA512_224_KEY_DERIVATION 0x0000004B
+CKM_SHA512_256 0x0000004C
+CKM_SHA512_256_HMAC 0x0000004D
+CKM_SHA512_256_HMAC_GENERAL 0x0000004E
+CKM_SHA512_256_KEY_DERIVATION 0x0000004F
 CKM_SHA512_HMAC 0x00000271
 CKM_SHA512_HMAC_GENERAL 0x00000272
 CKM_SHA512_KEY_DERIVATION 0x00000395
 CKM_SHA512_RSA_PKCS 0x00000042
 CKM_SHA512_RSA_PKCS_PSS 0x00000045
+CKM_SHA512_T 0x00000050
+CKM_SHA512_T_HMAC 0x00000051
+CKM_SHA512_T_HMAC_GENERAL 0x00000052
+CKM_SHA512_T_KEY_DERIVATION 0x00000053
 CKM_SHA_1 0x00000220
 CKM_SHA_1_HMAC 0x00000221
 CKM_SHA_1_HMAC_GENERAL 0x00000222
@@ -433,12 +524,23 @@
 CKM_SSL3_MD5_MAC 0x00000380
 CKM_SSL3_PRE_MASTER_KEY_GEN 0x00000370
 CKM_SSL3_SHA1_MAC 0x00000381
+CKM_TLS10_MAC_CLIENT 0x000003D7
+CKM_TLS10_MAC_SERVER 0x000003D6
+CKM_TLS12_KDF 0x000003D9
+CKM_TLS12_KEY_AND_MAC_DERIVE 0x000003E1
+CKM_TLS12_KEY_SAFE_DERIVE 0x000003E3
+CKM_TLS12_MAC 0x000003D8
+CKM_TLS12_MASTER_KEY_DERIVE 0x000003E0
+CKM_TLS12_MASTER_KEY_DERIVE_DH 0x000003E2
+CKM_TLS_KDF 0x000003E5
 CKM_TLS_KEY_AND_MAC_DERIVE 0x00000376
+CKM_TLS_MAC 0x000003E4
 CKM_TLS_MASTER_KEY_DERIVE 0x00000375
 CKM_TLS_MASTER_KEY_DERIVE_DH 0x00000377
 CKM_TLS_PRE_MASTER_KEY_GEN 0x00000374
 CKM_TLS_PRF 0x00000378
 CKM_TWOFISH_CBC 0x00001093
+CKM_TWOFISH_CBC_PAD 0x00001095
 CKM_TWOFISH_KEY_GEN 0x00001092
 CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE 0x000003D5
 CKM_WTLS_MASTER_KEY_DERIVE 0x000003D1
@@ -463,7 +565,15 @@
 CKO_PRIVATE_KEY 0x00000003
 CKO_PUBLIC_KEY 0x00000002
 CKO_SECRET_KEY 0x00000004
+CKP_PKCS5_PBKD2_HMAC_GOSTR3411 0x00000002
 CKP_PKCS5_PBKD2_HMAC_SHA1 0x00000001
+CKP_PKCS5_PBKD2_HMAC_SHA224 0x00000003
+CKP_PKCS5_PBKD2_HMAC_SHA256 0x00000004
+CKP_PKCS5_PBKD2_HMAC_SHA384 0x00000005
+CKP_PKCS5_PBKD2_HMAC_SHA512 0x00000006
+CKP_PKCS5_PBKD2_HMAC_SHA512_224 0x00000007
+CKP_PKCS5_PBKD2_HMAC_SHA512_256 0x00000008
+CKR_ACTION_PROHIBITED 0x0000001B
 CKR_ARGUMENTS_BAD 0x00000007
 CKR_ATTRIBUTE_READ_ONLY 0x00000010
 CKR_ATTRIBUTE_SENSITIVE 0x00000011
@@ -474,6 +584,7 @@
 CKR_CANT_LOCK 0x0000000A
 CKR_CRYPTOKI_ALREADY_INITIALIZED 0x00000191
 CKR_CRYPTOKI_NOT_INITIALIZED 0x00000190
+CKR_CURVE_NOT_SUPPORTED 0x00000140
 CKR_DATA_INVALID 0x00000020
 CKR_DATA_LEN_RANGE 0x00000021
 CKR_DEVICE_ERROR 0x00000030
@@ -482,6 +593,8 @@
 CKR_DOMAIN_PARAMS_INVALID 0x00000130
 CKR_ENCRYPTED_DATA_INVALID 0x00000040
 CKR_ENCRYPTED_DATA_LEN_RANGE 0x00000041
+CKR_EXCEEDED_MAX_ITERATIONS 0x000001B5
+CKR_FIPS_SELF_TEST_FAILED 0x000001B6
 CKR_FUNCTION_CANCELED 0x00000050
 CKR_FUNCTION_FAILED 0x00000006
 CKR_FUNCTION_NOT_PARALLEL 0x00000051
@@ -500,6 +613,7 @@
 CKR_KEY_SIZE_RANGE 0x00000062
 CKR_KEY_TYPE_INCONSISTENT 0x00000063
 CKR_KEY_UNEXTRACTABLE 0x0000006A
+CKR_LIBRARY_LOAD_FAILED 0x000001B7
 CKR_MECHANISM_INVALID 0x00000070
 CKR_MECHANISM_PARAM_INVALID 0x00000071
 CKR_MUTEX_BAD 0x000001A0
@@ -517,6 +631,8 @@
 CKR_PIN_INVALID 0x000000A1
 CKR_PIN_LEN_RANGE 0x000000A2
 CKR_PIN_LOCKED 0x000000A4
+CKR_PIN_TOO_WEAK 0x000001B8
+CKR_PUBLIC_KEY_INVALID 0x000001B9
 CKR_RANDOM_NO_RNG 0x00000121
 CKR_RANDOM_SEED_NOT_SUPPORTED 0x00000120
 CKR_SAVED_STATE_INVALID 0x00000160