Bugzilla Bug 291858: fixed incorrect definitions of the CKM_SHAxxx_HMAC,
authorwtchang%redhat.com
Thu, 28 Apr 2005 16:53:19 +0000
changeset 5632 fabaf609723b208f85d25338c0ef9c6e46708cdb
parent 5631 ccf344903d810d0412695a932e78b7321ad06507
child 5633 151ed927ca6ff9325219eadb3ab6d181deefb30c
child 5634 7c3cc2b95cd4bb5530b6744c36917af1c226dec0
push idunknown
push userunknown
push dateunknown
bugs291858
Bugzilla Bug 291858: fixed incorrect definitions of the CKM_SHAxxx_HMAC, CKM_SHAxxx_HMAC_GENERAL, CKM_ECDH1_DERIVE, CKM_ECDH1_COFACTOR_DERIVE, and CKM_ECMQV_DERIVE macros. r=nelsonb,relyea.
security/nss/lib/softoken/pkcs11t.h
--- a/security/nss/lib/softoken/pkcs11t.h
+++ b/security/nss/lib/softoken/pkcs11t.h
@@ -653,26 +653,26 @@ typedef CK_ULONG          CK_MECHANISM_T
 #define CKM_RIPEMD128                  0x00000230
 #define CKM_RIPEMD128_HMAC             0x00000231
 #define CKM_RIPEMD128_HMAC_GENERAL     0x00000232
 #define CKM_RIPEMD160                  0x00000240
 #define CKM_RIPEMD160_HMAC             0x00000241
 #define CKM_RIPEMD160_HMAC_GENERAL     0x00000242
 
 #define CKM_SHA256                     0x00000250	/* v2.20 */
-#define CKM_SHA256_HMAC_GENERAL        0x00000251	/* v2.20 */
-#define CKM_SHA256_HMAC                0x00000252	/* v2.20 */
+#define CKM_SHA256_HMAC                0x00000251	/* v2.20 */
+#define CKM_SHA256_HMAC_GENERAL        0x00000252	/* v2.20 */
 
 #define CKM_SHA384                     0x00000260	/* v2.20 */
-#define CKM_SHA384_HMAC_GENERAL        0x00000261	/* v2.20 */
-#define CKM_SHA384_HMAC                0x00000262	/* v2.20 */
+#define CKM_SHA384_HMAC                0x00000261	/* v2.20 */
+#define CKM_SHA384_HMAC_GENERAL        0x00000262	/* v2.20 */
 
 #define CKM_SHA512                     0x00000270	/* v2.20 */
-#define CKM_SHA512_HMAC_GENERAL        0x00000271	/* v2.20 */
-#define CKM_SHA512_HMAC                0x00000272	/* v2.20 */
+#define CKM_SHA512_HMAC                0x00000271	/* v2.20 */
+#define CKM_SHA512_HMAC_GENERAL        0x00000272	/* v2.20 */
 
 /* All of the following mechanisms are new for v2.0 */
 /* Note that CAST128 and CAST5 are the same algorithm */
 #define CKM_CAST_KEY_GEN               0x00000300
 #define CKM_CAST_ECB                   0x00000301
 #define CKM_CAST_CBC                   0x00000302
 #define CKM_CAST_MAC                   0x00000303
 #define CKM_CAST_MAC_GENERAL           0x00000304
@@ -781,19 +781,19 @@ typedef CK_ULONG          CK_MECHANISM_T
 #define CKM_BATON_SHUFFLE              0x00001035
 #define CKM_BATON_WRAP                 0x00001036
 #define CKM_ECDSA_KEY_PAIR_GEN         0x00001040 /* depricated in v2.11 */
 #define CKM_EC_KEY_PAIR_GEN            0x00001040
 #define CKM_ECDSA                      0x00001041
 #define CKM_ECDSA_SHA1                 0x00001042
 
 /* ECDH1 is new for 2.11 */
-#define CKM_ECDH1_DERIVE               0x00001043
-#define CKM_ECDH1_COFACTOR_DERIVE      0x00001044
-#define CKM_ECMQV_DERIVE               0x00001045
+#define CKM_ECDH1_DERIVE               0x00001050
+#define CKM_ECDH1_COFACTOR_DERIVE      0x00001051
+#define CKM_ECMQV_DERIVE               0x00001052
 
 #define CKM_JUNIPER_KEY_GEN            0x00001060
 #define CKM_JUNIPER_ECB128             0x00001061
 #define CKM_JUNIPER_CBC128             0x00001062
 #define CKM_JUNIPER_COUNTER            0x00001063
 #define CKM_JUNIPER_SHUFFLE            0x00001064
 #define CKM_JUNIPER_WRAP               0x00001065
 #define CKM_FASTHASH                   0x00001070