Support ChaCha20+Poly1305 cipher suites.

nss/lib/freebl/blapi.h

Index: nss/lib/freebl/blapi.h
===================================================================
--- nss/lib/freebl/blapi.h	(revision 228205)
+++ nss/lib/freebl/blapi.h	(working copy)
@@ -818,7 +818,39 @@
 		 unsigned int *outputLen, unsigned int maxOutputLen,
 		 const unsigned char *input, unsigned int inputLen);
 
+/******************************************/
+/*
+** ChaCha20+Poly1305 AEAD
+*/
 
+extern ChaCha20Poly1305Context *
+ChaCha20Poly1305_CreateContext(const unsigned char *key, unsigned int keyLen,
+			       unsigned int tagLen);
+
+extern SECStatus
+ChaCha20Poly1305_InitContext(ChaCha20Poly1305Context *ctx,
+			     const unsigned char *key, unsigned int keyLen,
+			     unsigned int tagLen);

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

I added the ChaCha20Poly1305_InitContext function to initialize a
ChaCha20Poly1305Context structure allocated by the caller. This should address
your concern of an extra heap allocation.

+
+extern void
+ChaCha20Poly1305_DestroyContext(ChaCha20Poly1305Context *ctx, PRBool freeit);
+
+extern SECStatus
+ChaCha20Poly1305_Seal(const ChaCha20Poly1305Context *ctx,
+		      unsigned char *output, unsigned int *outputLen,
+		      unsigned int maxOutputLen,
+		      const unsigned char *input, unsigned int inputLen,
+		      const unsigned char *nonce, unsigned int nonceLen,
+		      const unsigned char *ad, unsigned int adLen);
+
+extern SECStatus
+ChaCha20Poly1305_Open(const ChaCha20Poly1305Context *ctx,
+		      unsigned char *output, unsigned int *outputLen,
+		      unsigned int maxOutputLen,
+		      const unsigned char *input, unsigned int inputLen,
+		      const unsigned char *nonce, unsigned int nonceLen,
+		      const unsigned char *ad, unsigned int adLen);
+
 /******************************************/
 /*
 ** MD5 secure hash function