Support ChaCha20+Poly1305 cipher suites.

nss/lib/util/pkcs11n.h

Index: nss/lib/util/pkcs11n.h
===================================================================
--- nss/lib/util/pkcs11n.h	(revision 228205)
+++ nss/lib/util/pkcs11n.h	(working copy)
@@ -51,6 +51,8 @@
 #define CKK_NSS_JPAKE_ROUND1       (CKK_NSS + 2)
 #define CKK_NSS_JPAKE_ROUND2       (CKK_NSS + 3)
 
+#define CKK_NSS_CHACHA20           (CKK_NSS + 4)
+
 /*
  * NSS-defined certificate types
  *
@@ -214,6 +216,9 @@
 #define CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256   (CKM_NSS + 23)
 #define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24)
 
+#define CKM_NSS_CHACHA20_KEY_GEN                (CKM_NSS + 25)
+#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 26)
+
 /*
  * HISTORICAL:
  * Do not attempt to use these. They are only used by NETSCAPE's internal
@@ -281,6 +286,14 @@
     CK_ULONG ulHeaderLen;       /* in */
 } CK_NSS_MAC_CONSTANT_TIME_PARAMS;
 
+typedef struct CK_NSS_AEAD_PARAMS {
+    CK_BYTE_PTR  pIv;  /* This is the nonce. */
+    CK_ULONG     ulIvLen;
+    CK_BYTE_PTR  pAAD;
+    CK_ULONG     ulAADLen;
+    CK_ULONG     ulTagLen;

[wtc, 2013/10/22 22:36:42]

I changed this member to be a length in bytes. This will require a corresponding
change to net/third_party/nss/ssl.

+} CK_NSS_AEAD_PARAMS;
+
 /*
  * NSS-defined return values
  *