Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/softoken/sftkpwd.c

 /* 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/. */
 /* 
  *  The following code handles the storage of PKCS 11 modules used by the
  * NSS. For the rest of NSS, only one kind of database handle exists:
  *
  *     SFTKDBHandle
  *
  * There is one SFTKDBHandle for the each key database and one for each cert 
@@ skipping 259 matching lines @@
     sftkCipherValue cipherValue;
     SECItem *cipher = NULL;
     NSSPKCS5PBEParameter *param = NULL;
     unsigned char saltData[HASH_LENGTH_MAX];
 
     cipherValue.alg = SEC_OID_PKCS12_PBE_WITH_SHA1_AND_TRIPLE_DES_CBC;
     cipherValue.salt.len = SHA1_LENGTH;
     cipherValue.salt.data = saltData;
     RNG_GenerateGlobalRandomBytes(saltData,cipherValue.salt.len);
 
-    param = nsspkcs5_NewParam(cipherValue.alg, &cipherValue.salt, 1);
+    param = nsspkcs5_NewParam(cipherValue.alg, HASH_AlgSHA1, &cipherValue.salt,
+                              1);
     if (param == NULL) {
         rv = SECFailure;
         goto loser;
     }
     cipher = nsspkcs5_CipherData(param, passKey, plainText, PR_TRUE, NULL);
     if (cipher == NULL) {
         rv = SECFailure;
         goto loser;
     } 
     cipherValue.value = *cipher;
@@ skipping 151 matching lines @@
 
     /* initialize our CipherValue structure */
     signValue.alg = SEC_OID_PKCS5_PBMAC1;
     signValue.salt.len = prfLength;
     signValue.salt.data = saltData;
     signValue.value.data = signData;
     signValue.value.len = hmacLength;
     RNG_GenerateGlobalRandomBytes(saltData,prfLength);
 
     /* initialize our pkcs5 parameter */
-    param = nsspkcs5_NewParam(signValue.alg, &signValue.salt, 1);
+    param = nsspkcs5_NewParam(signValue.alg, HASH_AlgSHA1, &signValue.salt, 1);
     if (param == NULL) {
         rv = SECFailure;
         goto loser;
     }
     param->keyID = pbeBitGenIntegrityKey;
     /* set the PKCS 5 v2 parameters, not extractable from the
      * data passed into nsspkcs5_NewParam */
     param->encAlg = hmacAlg;
     param->hashType = prfType;
     param->keyLen = hmacLength;
@@ skipping 800 matching lines @@
     oldKey.data = NULL;
     oldKey.len = 0;
     sftkdb_switchKeys(keydb, &oldKey);
     if (oldKey.data) {
         PORT_ZFree(oldKey.data, oldKey.len);
     }
     return SECSuccess;
 }