Merge pull request #110 from bellgrim/SOFTHSM-112

SOFTHSM-112: CKM_AES_KEY_WRAP* conflict in pkcs11.h
opendnssec · Mar 8, 2015 · af8d4cc · af8d4cc
2 parents bbbe013 + e9ee33a
commit af8d4cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -7,6 +7,7 @@ Bugfixes:
 * SOFTHSM-109: Unused parameter and variable warnings.
 * SOFTHSM-110: subdir-objects warnings from autoreconf.
 * SOFTHSM-111: Include FIPS-NOTES.md in dist.
+* SOFTHSM-112: CKM_AES_KEY_WRAP* conflict in pkcs11.h.
 * SUPPORT-154: A marked as non-modifiable object cannot be generated.
 
 

diff --git a/src/lib/cryptoki_compat/pkcs11.h b/src/lib/cryptoki_compat/pkcs11.h
@@ -820,9 +820,7 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_AES_CTS			(0x1089)
 #define CKM_AES_CMAC			(0x108a)
 #define CKM_AES_CMAC_GENERAL		(0x108b)
-#define CKM_AES_KEY_WRAP		(0x1090)
 #define CKM_BLOWFISH_KEY_GEN		(0x1090)
-#define CKM_AES_KEY_WRAP_PAD		(0x1091)
 #define CKM_BLOWFISH_CBC		(0x1091)
 #define CKM_TWOFISH_KEY_GEN		(0x1092)
 #define CKM_TWOFISH_CBC			(0x1093)
@@ -853,6 +851,8 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_AES_CFB64			(0x2105)
 #define CKM_AES_CFB8			(0x2106)
 #define CKM_AES_CFB128			(0x2107)
+#define CKM_AES_KEY_WRAP		(0x2109)
+#define CKM_AES_KEY_WRAP_PAD		(0x210a)
 #define CKM_RSA_PKCS_TPM_1_1		(0x4001)
 #define CKM_RSA_PKCS_OAEPTPM_1_1	(0x4002)
 #define CKM_VENDOR_DEFINED		((unsigned long) (1ul << 31))