Unified Diff: lib/utils.js
Issue 5344719420784640:
Issue 1479 - nss3 library isn`t being found on OS X (Closed)
Patch Set:
Created Oct. 15, 2014, 11:08 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/utils.js |
| =================================================================== |
| --- a/lib/utils.js |
| +++ b/lib/utils.js |
| @@ -626,17 +626,22 @@ XPCOMUtils.defineLazyGetter(Utils, "cryp |
| let nsslib; |
| try |
| { |
| nsslib = ctypes.open(ctypes.libraryName("nss3")); |
| } |
| catch (e) |
| { |
| // It seems that on Mac OS X the full path name needs to be specified |
| - let file = Services.dirsvc.get("GreD", Ci.nsILocalFile); |
| + let file; |
| + // Gecko 35 added GreBinD key, see https://bugzilla.mozilla.org/show_bug.cgi?id=1077099 |
| + if (Services.dirsvc.has("GreBinD")) |
| + file = Services.dirsvc.get("GreBinD", Ci.nsILocalFile); |
| + else |
| + file = Services.dirsvc.get("GreD", Ci.nsILocalFile); |
| file.append(ctypes.libraryName("nss3")); |
| nsslib = ctypes.open(file.path); |
| } |
| let result = {}; |
| // seccomon.h |
| result.siUTF8String = 14; |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
