Uprev NSS to 3.23 on iOS

net/quic/crypto/chacha20_poly1305_decrypter_nss.cc

Index: net/quic/crypto/chacha20_poly1305_decrypter_nss.cc
diff --git a/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc b/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc
index aeff43a4c6e1d27b5c0e02c0dd0ade2aa2618917..7ba03ab3406409f2cc781e8a00f2830873d55696 100644
--- a/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc
+++ b/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc
@@ -35,9 +35,9 @@ void ChaCha20Poly1305Decrypter::FillAeadParams(StringPiece nonce,
                                                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();

[davidben, 2016/03/30 18:39:25]

This would be contingent on a src/third_party/nss DEPS roll, right? Not a
src/net/third_party/nss update. So I think this file's changes want to be in the
CL that updates DEPS.

[Ryan Sleevi, 2016/03/31 02:52:58]

Correct. Sorry, I didn't upload the DEPS bit yet, because the two had to be kept
in lock-step to run unittests, and this was the more time consuming one.

[davidben, 2016/03/31 05:23:00]

Got it.

   nss_aead_params->pAAD =
       reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
   nss_aead_params->ulAADLen = associated_data.size();