Merge pull request EFForg#315 from mhemantha/master

Peter Eckersley · Peter Eckersley · commit 2c43f84c3e48 · 2014-07-24T17:55:05.000-07:00
Initialize Convergence's NSS.js with nss library path (EFForg#8314)
diff --git a/src/chrome/content/code/NSS.js b/src/chrome/content/code/NSS.js
@@ -31,8 +31,10 @@ NSS.initialize = function(nssPath) {
   try {
     sharedLib = ctypes.open(nssPath);    
   } catch (e) {
-    dump("Failed to find nss3 in installed directory, checking system paths.\n");
-    sharedLib = ctypes.open(ctypes.libraryName("nss3"));
+    Components.utils.import("resource://gre/modules/Services.jsm");
+    var nssFile = Services.dirsvc.get("GreD", Ci.nsILocalFile);
+    nssFile.append(ctypes.libraryName("nss3"));
+    sharedLib = ctypes.open(nssFile.path);
   }
 
   NSS.types = new Object();
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -137,7 +137,7 @@ function SSLObservatory() {
     this.setupASNWatcher();
 
   try {
-    NSS.initialize("");
+    NSS.initialize(ctypes.libraryName("nss3"));
   } catch(e) {
     this.log(WARN, "Failed to initialize NSS component:" + e);
   }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ function SSLObservatory() {`
`137`	`137`	`this.setupASNWatcher();`
`138`	`138`
`139`	`139`	`try {`
`140`		`- NSS.initialize("");`
	`140`	`+ NSS.initialize(ctypes.libraryName("nss3"));`
`141`	`141`	`} catch(e) {`
`142`	`142`	`this.log(WARN, "Failed to initialize NSS component:" + e);`
`143`	`143`	`}`