fixing bug 190247 and 190151 blocker bugs - mozilla fails to enter secure site. r=chak,a=leaf

embedding/config/basebrowser-installer-win.pkg

@@ -217,12 +217,8 @@ components\wallet.xpt
 ; Optional - only if you need HTTPS support
 components\pipboot.dll
 components\pipboot.xpt
-components\pippki.dll
-components\pippki.xpt
 components\pipnss.dll
 components\pipnss.xpt
-chrome\pipnss.jar
-chrome\pippki.jar
 nss3.dll
 smime3.dll
 softokn3.dll

embedding/config/basebrowser-win

@@ -215,12 +215,8 @@ components\wallet.xpt
 ; Optional - only if you need HTTPS support
 components\pipboot.dll
 components\pipboot.xpt
-components\pippki.dll
-components\pippki.xpt
 components\pipnss.dll
 components\pipnss.xpt
-chrome\pipnss.jar
-chrome\pippki.jar
 nss3.dll
 smime3.dll
 softokn3.dll

xpinstall/packager/packages-win

@@ -161,6 +161,12 @@ bin\components\mozldap.xpt
 bin\nsldap32v50.dll
 bin\nsldappr32v50.dll
 
+;PSM related files
+bin\components\pippki.dll
+bin\components\pippki.xpt
+bin\chrome\pipnss.jar
+bin\chrome\pippki.jar
+
 ; chrome stuff
 bin\chrome\help.jar
 bin\chrome\comm.jar

xpinstall/packager/win_gre/gre.jst

@@ -148,12 +148,6 @@ if(verifyDiskSpace(fProgram, srDest))
 //    // we don't want to fail on errors for the above
 //    resetError();
 
-      // We need to register the psm chrome files
-      var pki = getFolder("Chrome", "pippki.jar");
-      var nss = getFolder("Chrome", "pipnss.jar");
-      registerChrome(CONTENT | DELAYED_CHROME, pki, "content/pippki/");
-      registerChrome(CONTENT | DELAYED_CHROME, nss, "content/pipnss/");
-
       err = performInstall();
       logComment("performInstall() returned: " + err);
   }

xpinstall/packager/windows/browser.jst

@@ -479,7 +479,6 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-platform/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-platform/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator-platform/");
-
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-region/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
@@ -507,6 +506,17 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/");
 
+    // We need to register the psm chrome files.
+    // We're checking to see if they exist first in case
+    // they were not built and packaged up.
+    var pki = getFolder("Chrome", "pippki.jar");
+    if(File.exists(pki)) 
+      registerChrome(CONTENT | DELAYED_CHROME, pki, "content/pippki/");
+
+    var nss = getFolder("Chrome", "pipnss.jar");
+    if(File.exists(nss)) 
+      registerChrome(CONTENT | DELAYED_CHROME, nss, "content/pipnss/");
+
     /* Log files that are created after the installer is done, so they can be uninstalled */
     logComment("Installing: "    + fProgram + ".autoreg");
     logComment("Installing: "    + fProgram + "Xpcs Registry.dat");