Support ChaCha20+Poly1305 cipher suites.

nss/lib/softoken/pkcs11i.h

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * Internal data structures and functions used by pkcs11.c
  */
 #ifndef _PKCS11I_H_
 #define _PKCS11I_H_ 1
 
 #include "nssilock.h"
 #include "seccomon.h"
 #include "secoidt.h"
 #include "lowkeyti.h" 
 #include "pkcs11t.h"
 
 #include "sftkdbt.h" 
+#include "chacha20poly1305.h"
 #include "hasht.h"
 
 /* 
  * Configuration Defines 
  *
  * The following defines affect the space verse speed trade offs of
  * the PKCS #11 module. For the most part the current settings are optimized
  * for web servers, where we want faster speed and lower lock contention at
  * the expense of space.
  */
@@ skipping 70 matching lines @@
 typedef struct SFTKTokenObjectStr SFTKTokenObject;
 typedef struct SFTKSessionStr SFTKSession;
 typedef struct SFTKSlotStr SFTKSlot;
 typedef struct SFTKSessionContextStr SFTKSessionContext;
 typedef struct SFTKSearchResultsStr SFTKSearchResults;
 typedef struct SFTKHashVerifyInfoStr SFTKHashVerifyInfo;
 typedef struct SFTKHashSignInfoStr SFTKHashSignInfo;
 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 */
 typedef void (*SFTKDestroy)(void *, PRBool);
 typedef void (*SFTKBegin)(void *);
 typedef SECStatus (*SFTKCipher)(void *,void *,unsigned int *,unsigned int,
                                         void *, unsigned int);
 typedef SECStatus (*SFTKVerify)(void *,void *,unsigned int,void *,unsigned int);
 typedef void (*SFTKHash)(void *,void *,unsigned int);
 typedef void (*SFTKEnd)(void *,void *,unsigned int *,unsigned int);
@@ skipping 275 matching lines @@
     void                *hashContext;
     SFTKBegin           begin;
     SFTKHash            update;
     SFTKEnd             end;
     CK_ULONG            macSize;
     int                 padSize;
     unsigned char       key[MAX_KEY_LEN];
     unsigned int        keySize;
 };
 
+/* SFTKChaCha20Poly1305Info saves the key, tag length, nonce, and additional
+ * data for a ChaCha20+Poly1305 AEAD operation. */
+struct SFTKChaCha20Poly1305InfoStr {
+    ChaCha20Poly1305Context freeblCtx;
+    unsigned char nonce[8];
+    unsigned char ad[16];
+    unsigned char *adOverflow;
+    unsigned int adLen;
+};
+
 /*
  * Template based on SECItems, suitable for passing as arrays
  */
 struct SFTKItemTemplateStr {
     CK_ATTRIBUTE_TYPE   type;
     SECItem             *item;
 };
 
 /* macro for setting SFTKTemplates. */
 #define SFTK_SET_ITEM_TEMPLATE(templ, count, itemPtr, attr) \
@@ skipping 324 matching lines @@
 
 extern CK_RV
 sftk_TLSPRFInit(SFTKSessionContext *context, 
                   SFTKObject *        key, 
                   CK_KEY_TYPE         key_type,
                   HASH_HashType       hash_alg);
 
 SEC_END_PROTOS
 
 #endif /* _PKCS11I_H_ */