Update to the new definitions of CKM_NSS_CHACHA20_POLY1305 and

net/third_party/nss/ssl/ssl3con.c

 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * SSL3 Protocol
  *
  * 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/. */
 
 /* TODO(ekr): Implement HelloVerifyRequest on server side. OK for now. */
 
@@ skipping 25 matching lines @@
 #ifndef CKM_NSS_TLS_PRF_GENERAL_SHA256
 #define CKM_NSS_TLS_PRF_GENERAL_SHA256          (CKM_NSS + 21)
 #define CKM_NSS_TLS_MASTER_KEY_DERIVE_SHA256    (CKM_NSS + 22)
 #define CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256   (CKM_NSS + 23)
 #define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24)
 #endif
 
 /* This is a bodge to allow this code to be compiled against older NSS
  * headers. */
 #ifndef CKM_NSS_CHACHA20_POLY1305
-#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 25)
+#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 26)
 
-typedef struct CK_AEAD_PARAMS {
-  CK_BYTE_PTR  pIv;  /* This is the nonce. */
-  CK_ULONG     ulIvLen;
-  CK_BYTE_PTR  pAAD;
-  CK_ULONG     ulAADLen;
-  CK_ULONG     ulTagBits;
-} CK_AEAD_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;
+} CK_NSS_AEAD_PARAMS;
 
 #endif
 
 #include <stdio.h>
 #ifdef NSS_ENABLE_ZLIB
 #include "zlib.h"
 #endif
 #ifdef LINUX
 #include <dlfcn.h>
 #endif
@@ skipping 1992 matching lines @@
         int *outlen,
         int maxout,
         const unsigned char *in,
         int inlen,
         const unsigned char *additionalData,
         int additionalDataLen)
 {
     SECItem            param;
     SECStatus          rv = SECFailure;
     unsigned int       uOutLen;
-    CK_AEAD_PARAMS     aeadParams;
+    CK_NSS_AEAD_PARAMS aeadParams;
     static const int   tagSize = 16;
 
     param.type = siBuffer;
     param.len = sizeof(aeadParams);
     param.data = (unsigned char *) &aeadParams;
-    memset(&aeadParams, 0, sizeof(CK_AEAD_PARAMS));
+    memset(&aeadParams, 0, sizeof(aeadParams));
     aeadParams.pIv = (unsigned char *) additionalData;
     aeadParams.ulIvLen = 8;
     aeadParams.pAAD = (unsigned char *) additionalData;
     aeadParams.ulAADLen = additionalDataLen;
-    aeadParams.ulTagBits = tagSize * 8;
+    aeadParams.ulTagLen = tagSize;
 
     if (doDecrypt) {
         rv = pk11_decrypt(keys->write_key, CKM_NSS_CHACHA20_POLY1305, &param,
                           out, &uOutLen, maxout, in, inlen);
     } else {
         rv = pk11_encrypt(keys->write_key, CKM_NSS_CHACHA20_POLY1305, &param,
                           out, &uOutLen, maxout, in, inlen);
     }
     *outlen = (int) uOutLen;
 
@@ skipping 10474 matching lines @@
             PORT_Free(ss->ssl3.hs.recvdFragments.buf);
         }
     }
 
     ss->ssl3.initialized = PR_FALSE;
 
     SECITEM_FreeItem(&ss->ssl3.nextProto, PR_FALSE);
 }
 
 /* End of ssl3con.c */