Uprev NSS to 3.23 on iOS

net/quic/crypto/chacha20_poly1305_encrypter_nss.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/crypto/chacha20_poly1305_encrypter.h"
 
 #include <pk11pub.h>
 
 using base::StringPiece;
 
@@ skipping 17 matching lines @@
 }
 
 ChaCha20Poly1305Encrypter::~ChaCha20Poly1305Encrypter() {}
 
 void ChaCha20Poly1305Encrypter::FillAeadParams(StringPiece nonce,
                                                StringPiece associated_data,
                                                size_t auth_tag_size,
                                                AeadParams* aead_params) const {
   aead_params->len = sizeof(aead_params->data.nss_aead_params);
   CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
-  nss_aead_params->pIv =
+  nss_aead_params->pNonce =
       reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
-  nss_aead_params->ulIvLen = nonce.size();
+  nss_aead_params->ulNonceLen = nonce.size();
   nss_aead_params->pAAD =
       reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
   nss_aead_params->ulAADLen = associated_data.size();
   nss_aead_params->ulTagLen = auth_tag_size;
 }
 
 }  // namespace net