Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/softoken/lowpbe.h

 /* 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/. */
 
 #ifndef _SECPKCS5_H_
 #define _SECPKCS5_H_
 
 #include "plarena.h"
 #include "secitem.h"
 #include "seccomon.h"
@@ skipping 59 matching lines @@
  */
 NSSPKCS5PBEParameter *
 nsspkcs5_AlgidToParam(SECAlgorithmID *algid);
 
 /*
  * Convert an Algorithm ID to a PBE Param.
  * NOTE: this does not suppport PKCS 5 v2 because it's only used for the
  * keyDB which only support PKCS 5 v1, PFX, and PKCS 12.
  */
 NSSPKCS5PBEParameter *
-nsspkcs5_NewParam(SECOidTag alg, SECItem *salt, int iterator);
+nsspkcs5_NewParam(SECOidTag alg, HASH_HashType hashType, SECItem *salt,
+                  int iterationCount);
 
 
 /* Encrypt/Decrypt data using password based encryption.  
  *  algid is the PBE algorithm identifier,
  *  pwitem is the password,
  *  src is the source for encryption/decryption,
  *  encrypt is PR_TRUE for encryption, PR_FALSE for decryption.
  * The key and iv are generated based upon PKCS #5 then the src
  * is either encrypted or decrypted.  If an error occurs, NULL
  * is returned, otherwise the ciphered contents is returned.
  */
 extern SECItem *
 nsspkcs5_CipherData(NSSPKCS5PBEParameter *, SECItem *pwitem,
                     SECItem *src, PRBool encrypt, PRBool *update);
 
 extern SECItem *
 nsspkcs5_ComputeKeyAndIV(NSSPKCS5PBEParameter *, SECItem *pwitem,
                                         SECItem *iv, PRBool faulty3DES);
 
 /* Destroys PBE parameter */
 extern void
 nsspkcs5_DestroyPBEParameter(NSSPKCS5PBEParameter *param);
 
 HASH_HashType HASH_FromHMACOid(SECOidTag oid);
 
 SEC_END_PROTOS
 
 #endif