Update to NSS 3.15.3.

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 659 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;
 
     for (i=0; i < sizeof(defaultFlags)*8; i++) {
-        if (defaultFlags & (1<<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;
                 }
             }
             if (string) {
                 if (flags) {
@@ skipping 191 matching lines @@
 
 
 /* construct the NSS cipher flags */
 static char *
 nssutil_mkCipherFlags(unsigned long ssl0, unsigned long ssl1)
 {
     char *cipher = NULL;
     int i;
 
     for (i=0; i < sizeof(ssl0)*8; i++) {
-        if (ssl0 & (1<<i)) {
+        if (ssl0 & (1UL <<i)) {
             char *string;
-            if ((1<<i) == SECMOD_FORTEZZA_FLAG) {
+            if ((1UL <<i) == SECMOD_FORTEZZA_FLAG) {
                 string = PR_smprintf("%s",NSSUTIL_ARG_FORTEZZA_FLAG);
             } else {
-                string = PR_smprintf("0h0x%08x",1<<i);
+                string = PR_smprintf("0h0x%08lx", 1UL <<i);
             }
             if (cipher) {
                 char *tmp;
                 tmp = PR_smprintf("%s,%s",cipher,string);
                 PR_smprintf_free(cipher);
                 PR_smprintf_free(string);
                 cipher = tmp;
             } else {
                 cipher = string;
             }
         }
     }
     for (i=0; i < sizeof(ssl0)*8; i++) {
-        if (ssl1 & (1<<i)) {
+        if (ssl1 & (1UL <<i)) {
             if (cipher) {
                 char *tmp;
-                tmp = PR_smprintf("%s,0l0x%08x",cipher,1<<i);
+                tmp = PR_smprintf("%s,0l0x%08lx",cipher, 1UL <<i);
                 PR_smprintf_free(cipher);
                 cipher = tmp;
             } else {
-                cipher = PR_smprintf("0l0x%08x",1<<i);
+                cipher = PR_smprintf("0l0x%08lx", 1UL <<i);
             }
         }
     }
 
     return cipher;
 }
 
 /* Assemble a full NSS string. */
 char *
 NSSUTIL_MkNSSString(char **slotStrings, int slotCount, PRBool internal, 
@@ skipping 179 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;
 }