Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/freebl/chacha20.h

Index: nss/lib/freebl/chacha20.h
diff --git a/nss/lib/freebl/chacha20/chacha20.h b/nss/lib/freebl/chacha20.h
similarity index 59%
rename from nss/lib/freebl/chacha20/chacha20.h
rename to nss/lib/freebl/chacha20.h
index 6336ba719ad0cb3a52ae9f5158ac6d2ab7156d8e..7e396fa8c0e6874699e948b51caa558ce3055213 100644
--- a/nss/lib/freebl/chacha20/chacha20.h
+++ b/nss/lib/freebl/chacha20.h
@@ -8,15 +8,19 @@
 #ifndef FREEBL_CHACHA20_H_
 #define FREEBL_CHACHA20_H_
 
+#if defined(_MSC_VER) && _MSC_VER < 1600
+#include "prtypes.h"
+typedef PRUint32 uint32_t;
+typedef PRUint64 uint64_t;
+#else
 #include <stdint.h>
+#endif
 
 /* ChaCha20XOR encrypts |inLen| bytes from |in| with the given key and
  * nonce and writes the result to |out|, which may be equal to |in|. The
  * initial block counter is specified by |counter|. */
-extern void ChaCha20XOR(unsigned char *out,
-			const unsigned char *in, unsigned int inLen,
-			const unsigned char key[32],
-			const unsigned char nonce[8],
-			uint64_t counter);
+extern void ChaCha20XOR(unsigned char *out, const unsigned char *in,
+                        unsigned int inLen, const unsigned char key[32],
+                        const unsigned char nonce[12], uint32_t counter);
 
-#endif  /* FREEBL_CHACHA20_H_ */
+#endif /* FREEBL_CHACHA20_H_ */