Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/pk11wrap/pk11pbe.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/. */
 
 #include "plarena.h"
 
 #include "seccomon.h"
 #include "secitem.h"
 #include "secport.h"
 #include "hasht.h"
@@ skipping 618 matching lines @@
                 cryptoMech = PK11_AlgtagToMechanism(cipherAlgorithm);
                 if (cryptoMech == CKM_INVALID_MECHANISM) {
                     goto loser;
                 }
                 keyLength = PK11_GetMaxKeyLength(cryptoMech);
             }
             if (keyLength == 0) {
                 goto loser;
             }
         }
-        /* currently only SEC_OID_HMAC_SHA1 is defined */
+        /* currently SEC_OID_HMAC_SHA1 is the default */
         if (prfAlg == SEC_OID_UNKNOWN) {
             prfAlg = SEC_OID_HMAC_SHA1;
         }
 
         /* build the PKCS5v2 cipher algorithm id */
         cipherParams = pk11_GenerateNewParamWithKeyLen( 
                         PK11_AlgtagToMechanism(cipherAlgorithm), keyLength);
         if (!cipherParams) {
             goto loser;
         }
@@ skipping 148 matching lines @@
         }
         paramData = (unsigned char *)pbeV2_params;
         paramLen = sizeof(CK_PKCS5_PBKD2_PARAMS);
 
         /* set the prf */
         prfAlgTag = SEC_OID_HMAC_SHA1;
         if (p5_param.pPrfAlgId &&
             p5_param.pPrfAlgId->algorithm.data != 0) {
             prfAlgTag = SECOID_GetAlgorithmTag(p5_param.pPrfAlgId);
         }
-        if (prfAlgTag == SEC_OID_HMAC_SHA1) {
-            pbeV2_params->prf = CKP_PKCS5_PBKD2_HMAC_SHA1;
-        } else {
-            /* only SHA1_HMAC is currently supported by PKCS #11 */
-            PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
-            goto loser;
-        }
+        switch (prfAlgTag) {
+        case SEC_OID_HMAC_SHA1:
+            pbeV2_params->prf = CKP_PKCS5_PBKD2_HMAC_SHA1;
+            break;
+        case SEC_OID_HMAC_SHA224:
+            pbeV2_params->prf = CKP_PKCS5_PBKD2_HMAC_SHA224;
+            break;
+        case SEC_OID_HMAC_SHA256:
+            pbeV2_params->prf = CKP_PKCS5_PBKD2_HMAC_SHA256;
+            break;
+        case SEC_OID_HMAC_SHA384:
+            pbeV2_params->prf = CKP_PKCS5_PBKD2_HMAC_SHA384;
+            break;
+        case SEC_OID_HMAC_SHA512:
+            pbeV2_params->prf = CKP_PKCS5_PBKD2_HMAC_SHA512;
+            break;
+        default:
+            PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
+            goto loser;
+        }
         
         /* probably should fetch these from the prfAlgid */
         pbeV2_params->pPrfData = NULL;
         pbeV2_params->ulPrfDataLen = 0;
         pbeV2_params->saltSource = CKZ_SALT_SPECIFIED;
         pSalt = ((CK_CHAR_PTR) pbeV2_params)+sizeof(CK_PKCS5_PBKD2_PARAMS);
         PORT_Memcpy(pSalt, salt->data, salt->len);
         pbeV2_params->pSaltSourceData = pSalt;
         pbeV2_params->ulSaltSourceDataLen = salt->len;
         pbeV2_params->iterations = iterations;
@@ skipping 598 matching lines @@
  *
  * This function returns both the mechanism and the parameter for the mechanism.
  * The caller is responsible for freeing the parameter.
  */
 CK_MECHANISM_TYPE
 PK11_GetPBECryptoMechanism(SECAlgorithmID *algid, SECItem **param, 
                            SECItem *pbe_pwd)
 {
     return pk11_GetPBECryptoMechanism(algid, param, pbe_pwd, PR_FALSE);
 }