Switch from the old vendor-defined mechanism numbers to the new official

PKCS 11 mechanism numbers.  These numbers will appear in v2.20.

security/nss/lib/softoken/pkcs11n.h

@@ -36,7 +36,7 @@
 #define _PKCS11N_H_
 
 #ifdef DEBUG
-static const char CKT_CVS_ID[] = "@(#) $RCSfile: pkcs11n.h,v $ $Revision: 1.6 $ $Date: 2002/12/12 06:05:11 $ $Name:  $";
+static const char CKT_CVS_ID[] = "@(#) $RCSfile: pkcs11n.h,v $ $Revision: 1.7 $ $Date: 2003/01/16 00:43:57 $ $Name:  $";
 #endif /* DEBUG */
 
 /*
@@ -165,25 +165,6 @@ static const char CKT_CVS_ID[] = "@(#) $RCSfile: pkcs11n.h,v $ $Revision: 1.6 $
 
 #define CKM_TLS_PRF_GENERAL                     0x80000373L
 
-/* These new SHAxxx mechanisms will be defined as vendor-defined until
-** they are given standard mechanism numbers.
-*/
-
-#define CKM_SHA256                              0x80000401L
-#define CKM_SHA256_HMAC                         0x80000402L
-#define CKM_SHA256_HMAC_GENERAL                 0x80000403L
-#define CKM_SHA256_RSA_PKCS                     0x80000404L
-
-#define CKM_SHA384                              0x80000411L
-#define CKM_SHA384_HMAC                         0x80000412L
-#define CKM_SHA384_HMAC_GENERAL                 0x80000413L
-#define CKM_SHA384_RSA_PKCS                     0x80000414L
-
-#define CKM_SHA512                              0x80000421L
-#define CKM_SHA512_HMAC                         0x80000422L
-#define CKM_SHA512_HMAC_GENERAL                 0x80000423L
-#define CKM_SHA512_RSA_PKCS                     0x80000424L
-
 /*
  * Netscape-defined return values
  *

security/nss/lib/softoken/pkcs11t.h

@@ -583,6 +583,10 @@ typedef CK_ULONG          CK_MECHANISM_TYPE;
 #define CKM_X9_42_DH_HYBRID_DERIVE     0x00000032
 #define CKM_X9_42_MQV_DERIVE           0x00000033
 
+#define CKM_SHA256_RSA_PKCS            0x00000040	/* v2.20 */
+#define CKM_SHA384_RSA_PKCS            0x00000041	/* v2.20 */
+#define CKM_SHA512_RSA_PKCS            0x00000042	/* v2.20 */
+
 #define CKM_RC2_KEY_GEN                0x00000100
 #define CKM_RC2_ECB                    0x00000101
 #define CKM_RC2_CBC                    0x00000102
@@ -649,6 +653,18 @@ typedef CK_ULONG          CK_MECHANISM_TYPE;
 #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_SHA384                     0x00000260	/* v2.20 */
+#define CKM_SHA384_HMAC_GENERAL        0x00000261	/* v2.20 */
+#define CKM_SHA384_HMAC                0x00000262	/* v2.20 */
+
+#define CKM_SHA512                     0x00000270	/* v2.20 */
+#define CKM_SHA512_HMAC_GENERAL        0x00000271	/* v2.20 */
+#define CKM_SHA512_HMAC                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
@@ -712,6 +728,10 @@ typedef CK_ULONG          CK_MECHANISM_TYPE;
 #define CKM_MD5_KEY_DERIVATION         0x00000390
 #define CKM_MD2_KEY_DERIVATION         0x00000391
 #define CKM_SHA1_KEY_DERIVATION        0x00000392
+#define CKM_SHA256_KEY_DERIVATION      0x00000393	/* v2.20 */
+#define CKM_SHA384_KEY_DERIVATION      0x00000394	/* v2.20 */
+#define CKM_SHA512_KEY_DERIVATION      0x00000395	/* v2.20 */
+
 #define CKM_PBE_MD2_DES_CBC            0x000003A0
 #define CKM_PBE_MD5_DES_CBC            0x000003A1
 #define CKM_PBE_MD5_CAST_CBC           0x000003A2