diff options
| author | wtchang%redhat.com <devnull@localhost> | 2005-04-28 16:53:19 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2005-04-28 16:53:19 +0000 |
| commit | 840467b147c5b419db785b116c6590bd33c512ce (patch) | |
| tree | ca81a99bb74bb0e41d750be456f97c8918d32d2d | |
| parent | c4cb2ff79b42292b64b1cc05dfe4059768bd1dc1 (diff) | |
| download | nss-hg-840467b147c5b419db785b116c6590bd33c512ce.tar.gz | |
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.
| -rw-r--r-- | security/nss/lib/softoken/pkcs11t.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/security/nss/lib/softoken/pkcs11t.h b/security/nss/lib/softoken/pkcs11t.h index 6386305b5..f3761f6b5 100644 --- a/security/nss/lib/softoken/pkcs11t.h +++ b/security/nss/lib/softoken/pkcs11t.h @@ -658,16 +658,16 @@ typedef CK_ULONG CK_MECHANISM_TYPE; #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 */ @@ -786,9 +786,9 @@ typedef CK_ULONG CK_MECHANISM_TYPE; #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 |