Update chacha20poly1305.patch for the changes made in r230713

net/third_party/nss/patches/chacha20poly1305.patch

 diff --git a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
 index 8be517c..53c29f0 100644
 --- a/nss/lib/ssl/ssl3con.c
 +++ b/nss/lib/ssl/ssl3con.c
 @@ -40,6 +40,21 @@
  #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"
 @@ -100,6 +115,8 @@ static SECStatus ssl3_AESGCMBypass(ssl3KeyMaterial *keys, PRBool doDecrypt,
  static ssl3CipherSuiteCfg cipherSuites[ssl_V3_SUITES_IMPLEMENTED] = {
     /*      cipher_suite                         policy      enabled is_present*/
  #ifdef NSS_ENABLE_ECC
@@ skipping 39 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 169 matching lines @@
 @@ -94,7 +94,8 @@ typedef enum {
      ssl_calg_aes      = 7,
      ssl_calg_camellia = 8,
      ssl_calg_seed     = 9,
 -    ssl_calg_aes_gcm  = 10
 +    ssl_calg_aes_gcm  = 10,
 +    ssl_calg_chacha20 = 11
  } SSLCipherAlgorithm;
  
  typedef enum {