diff --git a/mozilla/security/nss/lib/util/pkcs11n.h b/mozilla/security/nss/lib/util/pkcs11n.h
index bf760c68f06..e0224f70d2e 100644
--- a/mozilla/security/nss/lib/util/pkcs11n.h
+++ b/mozilla/security/nss/lib/util/pkcs11n.h
@@ -36,7 +36,7 @@
 #define _PKCS11N_H_
 
 #ifdef DEBUG
-static const char CKT_CVS_ID[] = "@(#) $RCSfile: pkcs11n.h,v $ $Revision: 1.5 $ $Date: 2009-03-25 05:20:49 $ $Name: not supported by cvs2svn $";
+static const char CKT_CVS_ID[] = "@(#) $RCSfile: pkcs11n.h,v $ $Revision: 1.6 $ $Date: 2009-03-25 05:20:50 $ $Name: not supported by cvs2svn $";
 #endif /* DEBUG */
 
 /*
@@ -168,13 +168,21 @@ static const char CKT_CVS_ID[] = "@(#) $RCSfile: pkcs11n.h,v $ $Revision: 1.5 $
 /* These new SHAxxx mechanisms will be defined as vendor-defined until
 ** they are given standard mechanism numbers.
 */
-#define CKM_SHA256				0x80000401L
-#define CKM_SHA384				0x80000402L
-#define CKM_SHA512				0x80000403L
 
-#define CKM_SHA256_RSA_PKCS			0x80000411L
-#define CKM_SHA384_RSA_PKCS			0x80000412L
-#define CKM_SHA512_RSA_PKCS			0x80000413L
+#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