summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornelsonb%netscape.com <devnull@localhost>2009-03-25 05:21:12 +0000
committernelsonb%netscape.com <devnull@localhost>2009-03-25 05:21:12 +0000
commitb386e6282cc4a95272121a1da67bde1545b87048 (patch)
treeff3d508a16914e1592f61a1bfe0554ef6b39dcb5
parenta49fb176cc3b8b2a836a7e47aaea7664ff2a8c37 (diff)
downloadnss-hg-b386e6282cc4a95272121a1da67bde1545b87048.tar.gz
Support SHA256, SHA384, and SHA512 hashes in NSS.
-rw-r--r--security/nss/lib/util/pkcs11n.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/security/nss/lib/util/pkcs11n.h b/security/nss/lib/util/pkcs11n.h
index 5c6624bb5..a15633884 100644
--- a/security/nss/lib/util/pkcs11n.h
+++ b/security/nss/lib/util/pkcs11n.h
@@ -168,13 +168,21 @@ static const char CKT_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$";
/* 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