Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/util/utilmod.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 each key database and one for each cert 
@@ skipping 147 matching lines @@
     } else {
         file = PR_smprintf("%s", filename);
     }
     PORT_Free(dirPath);
     return file;
 }
 
 static SECStatus nssutil_AddSecmodDBEntry(const char *appName,
                                           const char *filename,
                                           const char *dbname,
-                                          char *module, PRBool rw);
+                                          const char *module, PRBool rw);
 
 enum lfopen_mode { lfopen_truncate, lfopen_append };
 
 FILE *
 lfopen(const char *name, enum lfopen_mode om, os_open_permissions_type open_perms)
 {
     int fd;
     FILE *file;
 
     fd = os_open(name,
@@ skipping 24 matching lines @@
     char **moduleList = NULL;
     int moduleCount = 1;
     int useCount = SECMOD_STEP;
     char line[MAX_LINE_LENGTH];
     PRBool internal = PR_FALSE;
     PRBool skipParams = PR_FALSE;
     char *moduleString = NULL;
     char *paramsValue=NULL;
     PRBool failed = PR_TRUE;
 
-    moduleList = (char **) PORT_ZAlloc(useCount*sizeof(char **));
+    moduleList = (char **) PORT_ZAlloc(useCount*sizeof(char *));
     if (moduleList == NULL) return NULL;
 
     if (dbname == NULL) {
         goto return_default;
     }
 
     /* do we really want to use streams here */
     fd = fopen(dbname, "r");
     if (fd == NULL) goto done;
 
@@ skipping 156 matching lines @@
 
         /* couldn't get the old name */
         if (!olddbname) {
             goto bail;
         }
 
         /* old one exists */
         status = PR_Access(olddbname, PR_ACCESS_EXISTS);
         if (status == PR_SUCCESS) {
             PR_smprintf_free(olddbname);
-            PORT_ZFree(moduleList, useCount*sizeof(char **));
+            PORT_ZFree(moduleList, useCount*sizeof(char *));
             PORT_SetError(SEC_ERROR_LEGACY_DATABASE);
             return NULL;
         }
 
 bail:
         if (olddbname) {
             PR_smprintf_free(olddbname);
         }
     }
 
@@ skipping 61 matching lines @@
 }
 
 
 /*
  * Delete a module from the Data Base
  */
 static SECStatus
 nssutil_DeleteSecmodDBEntry(const char *appName,
                             const char *filename,
                             const char *dbname,
-                            char *args,
+                            const char *args,
                             PRBool rw)
 {
     /* SHDB_FIXME implement */
     os_stat_type stat_existing;
     os_open_permissions_type file_mode;
     FILE *fd = NULL;
     FILE *fd2 = NULL;
     char line[MAX_LINE_LENGTH];
     char *dbname2 = NULL;
     char *block = NULL;
@@ skipping 120 matching lines @@
     PORT_Free(name);
     return SECFailure;
 }
 
 /*
  * Add a module to the Data base 
  */
 static SECStatus
 nssutil_AddSecmodDBEntry(const char *appName,
                         const char *filename, const char *dbname,
-                         char *module, PRBool rw)
+                        const char *module, PRBool rw)
 {
     os_stat_type stat_existing;
     os_open_permissions_type file_mode;
     FILE *fd = NULL;
     char *block = NULL;
     PRBool libFound = PR_FALSE;
 
     if (dbname == NULL) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
@@ skipping 105 matching lines @@
                                              secmod, (char **)args, rw)
                  == SECSuccess) ? &success: NULL;
         break;
     }
 done:
     if (secmod) PR_smprintf_free(secmod);
     if (appName) PORT_Free(appName);
     if (filename) PORT_Free(filename);
     return rvstr;
 }