Support ChaCha20+Poly1305 cipher suites.

nss/lib/softoken/pkcs11i.h

Index: nss/lib/softoken/pkcs11i.h
===================================================================
--- nss/lib/softoken/pkcs11i.h	(revision 228205)
+++ nss/lib/softoken/pkcs11i.h	(working copy)
@@ -104,6 +104,7 @@
 typedef struct SFTKOAEPEncryptInfoStr SFTKOAEPEncryptInfo;
 typedef struct SFTKOAEPDecryptInfoStr SFTKOAEPDecryptInfo;
 typedef struct SFTKSSLMACInfoStr SFTKSSLMACInfo;
+typedef struct SFTKChaCha20Poly1305InfoStr SFTKChaCha20Poly1305Info;
 typedef struct SFTKItemTemplateStr SFTKItemTemplate;
 
 /* define function pointer typdefs for pointer tables */
@@ -399,6 +400,17 @@
     unsigned int	keySize;
 };
 
+/* SFTKChaCha20Poly1305Info saves the key and additional data for a
+ * ChaCha20+Poly1305 AEAD operation. */
+struct SFTKChaCha20Poly1305InfoStr {
+    unsigned char key[32];
+    unsigned char nonce[8];
+    unsigned char ad[16];
+    unsigned char *adOverflow;
+    unsigned int adLen;
+    unsigned char tagLen;
+};
+
 /*
  * Template based on SECItems, suitable for passing as arrays
  */