Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/util/utilpars.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 decide that later.
  */
 #include "secport.h"
 #include "prprf.h" 
@@ skipping 31 matching lines @@
     case '\"':
     case '<':
     case '{': /* } end curly to keep vi bracket matching working */
     case '(': /* ) */
     case '[': /* ] */ return PR_TRUE;
     default: break;
     }
     return PR_FALSE;
 }
 
-char *NSSUTIL_ArgStrip(char *c) {
+const char *NSSUTIL_ArgStrip(const char *c) {
    while (*c && NSSUTIL_ArgIsBlank(*c)) c++;
    return 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;
 
     if (NSSUTIL_ArgIsQuote(*string)) {
         endChar = NSSUTIL_ArgGetPair(*string);
         string++;
     }
 
     for (;*string; string++) {
         if (lastEscape) {
@@ skipping 11 matching lines @@
     }
 
     return string;
 }
 
 /*
  * get the value pointed to by string. string should be pointing just beyond
  * 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;
 
     len = end - string;
     if (len == 0) {
         *pcount = 0;
         return NULL;
     }
 
@@ skipping 13 matching lines @@
         lastEscape = PR_FALSE;
         *copyString++ = *string;
     }
     *copyString = 0;
     return retString;
 }
 
 /*
  * 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; }
         if (NSSUTIL_ArgIsBlank(*string)) return(string); 
      }
 
      end = NSSUTIL_ArgFindEnd(string);
      if (*end) end++;
      return end;
 }
 
 /*
  * 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);
     char *returnValue = NULL;
     int next;
 
     if ((parameters == NULL) || (*parameters == 0)) return NULL;
 
     PORT_Assert(paramLen+2 < sizeof(searchValue));
 
     PORT_Strcpy(searchValue,paramName);
     PORT_Strcat(searchValue,"=");
     while (*parameters) {
         if (PORT_Strncasecmp(parameters,searchValue,paramLen+1) == 0) {
             parameters += paramLen+1;
             returnValue = NSSUTIL_ArgFetchValue(parameters,&next);
             break;
         } else {
             parameters = NSSUTIL_ArgSkipParameter(parameters);
         }
         parameters = NSSUTIL_ArgStrip(parameters);
    }
    return returnValue;
 }
   
 /*
  * 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 == ',') {
             flags++;
             break;
         }
     }
     return 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;
 
     flags = NSSUTIL_ArgGetParamValue(label,parameters);
     if (flags == NULL) return PR_FALSE;
 
     for (index=flags; *index; index=NSSUTIL_ArgNextFlag(index)) {
         if (PORT_Strncasecmp(index,flag,len) == 0) {
             found=PR_TRUE;
             break;
         }
     }
     PORT_Free(flags);
     return found;
 }
 
 /*
  * 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;
     long retValue = 0;
     int sign = 1;
     int digit;
 
     if (num == NULL) return retValue;
 
     num = NSSUTIL_ArgStrip(num);
@@ skipping 29 matching lines @@
 
     retValue = ((int) value) * sign;
     return retValue;
 }
 
 /*
  * parameters are tag value pairs. This function returns the tag or label (the
  * 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>= */
     for (string = inString;*string; string++) {
         if (*string == '=') { break; }
         if (NSSUTIL_ArgIsBlank(*string)) break;
     }
 
     len = string - inString;
 
     *next = len; 
     if (*string == '=') (*next) += 1;
     if (len > 0) {
         name = PORT_Alloc(len+1);
         PORT_Strncpy(name,inString,len);
         name[len] = 0;
     }
     return name;
 }
 
 /*
  * 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;
     }
     retValue = NSSUTIL_ArgDecodeNumber(value);
     if (value) PORT_Free(value);
 
     return retValue;
 }
 
@@ skipping 244 matching lines @@
         NSSUTIL_ARG_ENTRY(RANDOM,SECMOD_RANDOM_FLAG),
         NSSUTIL_ARG_ENTRY(Disable, SECMOD_DISABLE_FLAG),
 };
 
 static int nssutil_argSlotFlagTableSize = 
         sizeof(nssutil_argSlotFlagTable)/sizeof(nssutil_argSlotFlagTable[0]);
 
 
 /* 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;
 
     flags = NSSUTIL_ArgGetParamValue(label,params);
     if (flags == NULL) return 0;
 
     if (PORT_Strcasecmp(flags,"all") == 0) all = PR_TRUE;
 
     for (index=flags; *index; index=NSSUTIL_ArgNextFlag(index)) {
@@ skipping 34 matching lines @@
         slotInfo->defaultFlags |= PK11_OWN_PW_DEFAULTS;
     }
     slotInfo->hasRootCerts = NSSUTIL_ArgHasFlag("rootFlags", "hasRootCerts", 
                                                params);
     slotInfo->hasRootTrust = NSSUTIL_ArgHasFlag("rootFlags", "hasRootTrust", 
                                                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;
 
     *retCount = 0;
     if ((slotParams == NULL) || (*slotParams == 0))  return NULL;
 
     /* first count the number of slots */
     for (slotIndex = NSSUTIL_ArgStrip(slotParams); *slotIndex; 
          slotIndex = NSSUTIL_ArgStrip(NSSUTIL_ArgSkipParameter(slotIndex))) {
         count++;
@@ skipping 31 matching lines @@
 }
 
 /************************************************************************
  * make a new slot specific parameter 
  */
 /* first make the slot flags */
 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)) {
             char *string = NULL;
 
             for (j=0; j < nssutil_argSlotFlagTableSize; j++) {
                 if (nssutil_argSlotFlagTable[j].value == ( 1UL << i )) {
                     string = nssutil_argSlotFlagTable[j].name;
                     break;
                 }
@@ skipping 72 matching lines @@
     nssutil_freePair(rootFlagsPair);
     return slotString;
 }
 
 
 /************************************************************************
  * Parse Full module specs into: library, commonName, module parameters,
  * 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)
 {
     int next;
     modulespec = NSSUTIL_ArgStrip(modulespec);
 
     *lib = *mod = *parameters = *nss = *config = 0;
 
     while (*modulespec) {
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*lib,"library=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*mod,"name=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*parameters,"parameters=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*nss,"nss=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*config,"config=",;)
         NSSUTIL_HANDLE_FINAL_ARG(modulespec)
    }
    return SECSuccess;
 }
 
 /************************************************************************
  * Parse Full module specs into: library, commonName, module parameters,
  * 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;
     modulespec = NSSUTIL_ArgStrip(modulespec);
 
     *lib = *mod = *parameters = *nss = 0;
 
     while (*modulespec) {
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*lib,"library=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*mod,"name=",;)
@@ skipping 43 matching lines @@
 {
     return NSSUTIL_MkModuleSpecEx(dllName, commonName, parameters, NSS, NULL);
 }
 
 
 #define NSSUTIL_ARG_FORTEZZA_FLAG "FORTEZZA"
 /******************************************************************************
  * 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;
 
     for (;*cipherList; cipherList=NSSUTIL_ArgNextFlag(cipherList)) {
         if (PORT_Strncasecmp(cipherList,NSSUTIL_ARG_FORTEZZA_FLAG,
                                 sizeof(NSSUTIL_ARG_FORTEZZA_FLAG)-1) == 0) {
             newCiphers[0] |= SECMOD_FORTEZZA_FLAG;
         } 
 
@@ skipping 50 matching lines @@
     }
     return flags;
 }
 
 
 /* construct the NSS cipher flags */
 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)) {
             char *string;
             if ((1UL <<i) == SECMOD_FORTEZZA_FLAG) {
                 string = PR_smprintf("%s",NSSUTIL_ARG_FORTEZZA_FLAG);
             } else {
                 string = PR_smprintf("0h0x%08lx", 1UL <<i);
             }
             if (cipher) {
@@ skipping 24 matching lines @@
 }
 
 /* Assemble a full NSS string. */
 char *
 NSSUTIL_MkNSSString(char **slotStrings, int slotCount, PRBool internal, 
           PRBool isFIPS, PRBool isModuleDB,  PRBool isModuleDBOnly, 
           PRBool isCritical, unsigned long trustOrder, 
           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;
 
 
     /* now let's build up the string
      * first the slot infos
      */
     slotLen=0;
     for (i=0; i < (int)slotCount; i++) {
         slotLen += PORT_Strlen(slotStrings[i])+1;
     }
@@ skipping 84 matching lines @@
         dbType = NSS_DB_TYPE_SQL;
         configdir = configdir + sizeof(SQLDB) -1;
     } else if (PORT_Strncmp(configdir, EXTERNDB, sizeof(EXTERNDB)-1) == 0) {
         dbType = NSS_DB_TYPE_EXTERN;
         configdir = configdir + sizeof(EXTERNDB) -1;
     } else if (PORT_Strncmp(configdir, LEGACY, sizeof(LEGACY)-1) == 0) {
         dbType = NSS_DB_TYPE_LEGACY;
         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;
             } else if (PORT_Strncmp(defaultType,EXTERNDB,sizeof(EXTERNDB)-2)==0) {
                 dbType = NSS_DB_TYPE_EXTERN;
             } else if (PORT_Strncmp(defaultType, LEGACY, sizeof(LEGACY)-2) == 0) {
                 dbType = NSS_DB_TYPE_LEGACY;
             }
         }
     }
     /* if the caller has already set a type, don't change it */
     if (*pdbType == NSS_DB_TYPE_NONE) {
         *pdbType = dbType;
     }
     return 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=",;)
         NSSUTIL_HANDLE_STRING_ARG(param,secmodName,"secmod=",;)
         NSSUTIL_HANDLE_FINAL_ARG(param)
    }
 
    *rw = PR_TRUE;
    if (NSSUTIL_ArgHasFlag("flags","readOnly",save_params)) {
         *rw = PR_FALSE;
@@ skipping 28 matching lines @@
         value = PR_smprintf("%s" NSSUTIL_PATH_SEPARATOR "%s",
                         lconfigdir,secmodName);
    } else {
         value = PR_smprintf("%s",secmodName);
    }
    if (configdir) PORT_Free(configdir);
    return value;
 }