Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/softoken/sftkpars.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. This file is written to abstract away how the modules are
  * stored so we can deside that later.
  */
 #include "pkcs11i.h"
 #include "sdb.h"
@@ skipping 24 matching lines @@
     parsed->pwRequired = NSSUTIL_ArgHasFlag("flags","passwordRequired",tmp);
     parsed->optimizeSpace = NSSUTIL_ArgHasFlag("flags","optimizeSpace",tmp);
     return;
 }
 
 static CK_RV
 sftk_parseTokenParameters(char *param, sftk_token_parameters *parsed) 
 {
     int next;
     char *tmp = NULL;
-    char *index;
+    const char *index;
     index = NSSUTIL_ArgStrip(param);
 
     while (*index) {
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->configdir,"configDir=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->updatedir,"updateDir=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->updCertPrefix,
                                                 "updateCertPrefix=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->updKeyPrefix,
                                                 "updateKeyPrefix=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->updateID,"updateID=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->certPrefix,"certPrefix=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->keyPrefix,"keyPrefix=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->tokdes,"tokenDescription=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->updtokdes,
                                                 "updateTokenDescription=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,parsed->slotdes,"slotDescription=",;)
         NSSUTIL_HANDLE_STRING_ARG(index,tmp,"minPWLen=", 
            if(tmp) { parsed->minPW=atoi(tmp); PORT_Free(tmp); tmp = NULL; })
         NSSUTIL_HANDLE_STRING_ARG(index,tmp,"flags=", 
            if(tmp) { sftk_parseTokenFlags(param,parsed); PORT_Free(tmp); 
                      tmp = NULL; })
         NSSUTIL_HANDLE_FINAL_ARG(index)
    }
    return CKR_OK;
 }
 
 static void
 sftk_parseTokens(char *tokenParams, sftk_parameters *parsed)
 {
-    char *tokenIndex;
+    const char *tokenIndex;
     sftk_token_parameters *tokens = NULL;
     int i=0,count = 0,next;
 
     if ((tokenParams == NULL) || (*tokenParams == 0))  return;
 
     /* first count the number of slots */
     for (tokenIndex = NSSUTIL_ArgStrip(tokenParams); *tokenIndex;
          tokenIndex = NSSUTIL_ArgStrip(NSSUTIL_ArgSkipParameter(tokenIndex))) {
         count++;
     }
@@ skipping 27 matching lines @@
     parsed->token_count = i;
     parsed->tokens = tokens;
     return; 
 }
 
 CK_RV
 sftk_parseParameters(char *param, sftk_parameters *parsed, PRBool isFIPS) 
 {
     int next;
     char *tmp = NULL;
-    char *index;
+    const char *index;
     char *certPrefix = NULL, *keyPrefix = NULL;
     char *tokdes = NULL, *ptokdes = NULL, *pupdtokdes = NULL;
     char *slotdes = NULL, *pslotdes = NULL;
     char *fslotdes = NULL, *ftokdes = NULL;
     char *minPW = NULL;
     index = NSSUTIL_ArgStrip(param);
 
     PORT_Memset(parsed, 0, sizeof(sftk_parameters));
 
     while (*index) {
@@ skipping 105 matching lines @@
 
     FREE_CLEAR(params->configdir);
     FREE_CLEAR(params->secmodName);
     FREE_CLEAR(params->man);
     FREE_CLEAR(params->libdes); 
     FREE_CLEAR(params->tokens);
     FREE_CLEAR(params->updatedir);
     FREE_CLEAR(params->updateID);
 }