Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/util/utilpars.c

Index: nss/lib/util/utilpars.c
diff --git a/nss/lib/util/utilpars.c b/nss/lib/util/utilpars.c
index 278f9c426dd8ab020651691f337b4ce1f9b22844..eef3eee7e9c9cdbe5ab965bc2d2a5525d15d0090 100644
--- a/nss/lib/util/utilpars.c
+++ b/nss/lib/util/utilpars.c
@@ -49,7 +49,7 @@ PRBool NSSUTIL_ArgIsQuote(char c) {
     return PR_FALSE;
 }
 
-char *NSSUTIL_ArgStrip(char *c) {
+const char *NSSUTIL_ArgStrip(const char *c) {
    while (*c && NSSUTIL_ArgIsBlank(*c)) c++;
    return c;
 }
@@ -58,8 +58,8 @@ char *NSSUTIL_ArgStrip(char *c) {
  * find the end of the current tag/value pair. string should be pointing just
  * after the equal sign. Handles quoted characters.
  */
-char *
-NSSUTIL_ArgFindEnd(char *string) {
+const char *
+NSSUTIL_ArgFindEnd(const char *string) {
     char endChar = ' ';
     PRBool lastEscape = PR_FALSE;
 
@@ -91,9 +91,9 @@ NSSUTIL_ArgFindEnd(char *string) {
  * the equal sign.
  */
 char *
-NSSUTIL_ArgFetchValue(char *string, int *pcount)
+NSSUTIL_ArgFetchValue(const char *string, int *pcount)
 {
-    char *end = NSSUTIL_ArgFindEnd(string);
+    const char *end = NSSUTIL_ArgFindEnd(string);
     char *retString, *copyString;
     PRBool lastEscape = PR_FALSE;
     int len;
@@ -127,10 +127,10 @@ NSSUTIL_ArgFetchValue(char *string, int *pcount)
 /*
  * point to the next parameter in string
  */
-char *
-NSSUTIL_ArgSkipParameter(char *string) 
+const char *
+NSSUTIL_ArgSkipParameter(const char *string)
 {
-     char *end;
+     const char *end;
      /* look for the end of the <name>= */
      for (;*string; string++) {
 	if (*string == '=') { string++; break; }
@@ -146,7 +146,7 @@ NSSUTIL_ArgSkipParameter(char *string)
  * get the value from that tag value pair.
  */
 char *
-NSSUTIL_ArgGetParamValue(char *paramName,char *parameters)
+NSSUTIL_ArgGetParamValue(const char *paramName, const char *parameters)
 {
     char searchValue[256];
     int paramLen = strlen(paramName);
@@ -175,8 +175,8 @@ NSSUTIL_ArgGetParamValue(char *paramName,char *parameters)
 /*
  * find the next flag in the parameter list
  */  
-char *
-NSSUTIL_ArgNextFlag(char *flags)
+const char *
+NSSUTIL_ArgNextFlag(const char *flags)
 {
     for (; *flags ; flags++) {
 	if (*flags == ',') {
@@ -191,9 +191,10 @@ NSSUTIL_ArgNextFlag(char *flags)
  * return true if the flag is set in the label parameter.
  */
 PRBool
-NSSUTIL_ArgHasFlag(char *label, char *flag, char *parameters)
+NSSUTIL_ArgHasFlag(const char *label, const char *flag, const char *parameters)
 {
-    char *flags,*index;
+    char *flags;
+    const char *index;
     int len = strlen(flag);
     PRBool found = PR_FALSE;
 
@@ -214,7 +215,7 @@ NSSUTIL_ArgHasFlag(char *label, char *flag, char *parameters)
  * decode a number. handle octal (leading '0'), hex (leading '0x') or decimal
  */
 long
-NSSUTIL_ArgDecodeNumber(char *num)
+NSSUTIL_ArgDecodeNumber(const char *num)
 {
     int	radix = 10;
     unsigned long value = 0;
@@ -264,10 +265,10 @@ NSSUTIL_ArgDecodeNumber(char *num)
  * value before the equal size.
  */
 char *
-NSSUTIL_ArgGetLabel(char *inString, int *next) 
+NSSUTIL_ArgGetLabel(const char *inString, int *next)
 {
     char *name=NULL;
-    char *string;
+    const char *string;
     int len;
 
     /* look for the end of the <label>= */
@@ -292,13 +293,14 @@ NSSUTIL_ArgGetLabel(char *inString, int *next)
  * read an argument at a Long integer
  */
 long
-NSSUTIL_ArgReadLong(char *label,char *params, long defValue, PRBool *isdefault)
+NSSUTIL_ArgReadLong(const char *label, const char *params,
+		    long defValue, PRBool *isdefault)
 {
     char *value;
     long retValue;
     if (isdefault) *isdefault = PR_FALSE; 
 
-    value = NSSUTIL_ArgGetParamValue(label,params);
+    value = NSSUTIL_ArgGetParamValue(label, params);
     if (value == NULL) {
 	if (isdefault) *isdefault = PR_TRUE;
 	return defValue;
@@ -563,9 +565,10 @@ static int nssutil_argSlotFlagTableSize =
 
 /* turn the slot flags into a bit mask */
 unsigned long
-NSSUTIL_ArgParseSlotFlags(char *label,char *params)
+NSSUTIL_ArgParseSlotFlags(const char *label, const char *params)
 {
-    char *flags,*index;
+    char *flags;
+    const char *index;
     unsigned long retValue = 0;
     int i;
     PRBool all = PR_FALSE;
@@ -620,9 +623,10 @@ nssutil_argDecodeSingleSlotInfo(char *name, char *params,
 
 /* parse all the slot specific parameters. */
 struct NSSUTILPreSlotInfoStr *
-NSSUTIL_ArgParseSlotInfo(PLArenaPool *arena, char *slotParams, int *retCount)
+NSSUTIL_ArgParseSlotInfo(PLArenaPool *arena, const char *slotParams,
+			 int *retCount)
 {
-    char *slotIndex;
+    const char *slotIndex;
     struct NSSUTILPreSlotInfoStr *slotInfo = NULL;
     int i=0,count = 0,next;
 
@@ -674,7 +678,8 @@ static char *
 nssutil_mkSlotFlags(unsigned long defaultFlags)
 {
     char *flags=NULL;
-    int i,j;
+    unsigned int i;
+    int j;
 
     for (i=0; i < sizeof(defaultFlags)*8; i++) {
 	if (defaultFlags & (1UL <<i)) {
@@ -767,7 +772,7 @@ NSSUTIL_MkSlotString(unsigned long slotID, unsigned long defaultFlags,
  * and NSS specifi parameters.
  */
 SECStatus
-NSSUTIL_ArgParseModuleSpecEx(char *modulespec, char **lib, char **mod, 
+NSSUTIL_ArgParseModuleSpecEx(const char *modulespec, char **lib, char **mod,
 					char **parameters, char **nss,
 					char **config)
 {
@@ -792,7 +797,7 @@ NSSUTIL_ArgParseModuleSpecEx(char *modulespec, char **lib, char **mod,
  * and NSS specifi parameters.
  */
 SECStatus
-NSSUTIL_ArgParseModuleSpec(char *modulespec, char **lib, char **mod, 
+NSSUTIL_ArgParseModuleSpec(const char *modulespec, char **lib, char **mod,
 					char **parameters, char **nss)
 {
     int next;
@@ -856,7 +861,7 @@ NSSUTIL_MkModuleSpec(char *dllName, char *commonName, char *parameters,
  * Parse the cipher flags from the NSS parameter
  */
 void
-NSSUTIL_ArgParseCipherFlags(unsigned long *newCiphers,char *cipherList)
+NSSUTIL_ArgParseCipherFlags(unsigned long *newCiphers, const char *cipherList)
 {
     newCiphers[0] = newCiphers[1] = 0;
     if ((cipherList == NULL) || (*cipherList == 0)) return;
@@ -927,7 +932,7 @@ static char *
 nssutil_mkCipherFlags(unsigned long ssl0, unsigned long ssl1)
 {
     char *cipher = NULL;
-    int i;
+    unsigned int i;
 
     for (i=0; i < sizeof(ssl0)*8; i++) {
 	if (ssl0 & (1UL <<i)) {
@@ -972,7 +977,8 @@ NSSUTIL_MkNSSString(char **slotStrings, int slotCount, PRBool internal,
 	  unsigned long cipherOrder, unsigned long ssl0, unsigned long ssl1)
 {
     int slotLen, i;
-    char *slotParams, *ciphers, *nss, *nssFlags, *tmp;
+    char *slotParams, *ciphers, *nss, *nssFlags;
+    const char *tmp;
     char *trustOrderPair,*cipherOrderPair,*slotPair,*cipherPair,*flagPair;
 
 
@@ -1077,7 +1083,7 @@ _NSSUTIL_EvaluateConfigDir(const char *configdir,
 	configdir = configdir + sizeof(LEGACY) -1;
     } else {
 	/* look up the default from the environment */
-	char *defaultType = PR_GetEnv("NSS_DEFAULT_DB_TYPE");
+	char *defaultType = PR_GetEnvSecure("NSS_DEFAULT_DB_TYPE");
 	if (defaultType != NULL) {
 	    if (PORT_Strncmp(defaultType, SQLDB, sizeof(SQLDB)-2) == 0) {
 		dbType = NSS_DB_TYPE_SQL;
@@ -1096,18 +1102,17 @@ _NSSUTIL_EvaluateConfigDir(const char *configdir,
 }
 
 char *
-_NSSUTIL_GetSecmodName(char *param, NSSDBType *dbType, char **appName,
+_NSSUTIL_GetSecmodName(const char *param, NSSDBType *dbType, char **appName,
 		   char **filename, PRBool *rw)
 {
     int next;
     char *configdir = NULL;
     char *secmodName = NULL;
     char *value = NULL;
-    char *save_params = param;
+    const char *save_params = param;
     const char *lconfigdir;
     PRBool noModDB = PR_FALSE;
     param = NSSUTIL_ArgStrip(param);
-	
 
     while (*param) {
 	NSSUTIL_HANDLE_STRING_ARG(param,configdir,"configDir=",;)