Fixed forge path issue, #4049
Ylian Saint-Hilaire committed
May 29, 2022 at 11:50 UTC
a799b9855a6ff0178fe9668b58e5e988de0dcfd1
1 file changed
+26
-10
pkcs7-modified.js
+26
-10
@@ -16,16 +16,32 @@
16
* a separate file pkcs7asn1.js, since those are referenced from other
17
* PKCS standards like PKCS #12.
18
*/
19
-var forge = require('./node_modules/node-forge/lib/forge');
20
-require('./node_modules/node-forge/lib/aes');
21
-require('./node_modules/node-forge/lib/asn1');
22
-require('./node_modules/node-forge/lib/des');
23
-require('./node_modules/node-forge/lib/oids');
24
-require('./node_modules/node-forge/lib/pem');
25
-require('./node_modules/node-forge/lib/pkcs7asn1');
26
-require('./node_modules/node-forge/lib/random');
27
-require('./node_modules/node-forge/lib/util');
28
-require('./node_modules/node-forge/lib/x509');
19
+var forge;
20
+try {
21
+ forge = require('../node-forge/lib/forge');
22
+ require('../node-forge/lib/aes');
23
+ require('../node-forge/lib/asn1');
24
+ require('../node-forge/lib/des');
25
+ require('../node-forge/lib/oids');
26
+ require('../node-forge/lib/pem');
27
+ require('../node-forge/lib/pkcs7asn1');
28
+ require('../node-forge/lib/random');
29
+ require('../node-forge/lib/util');
30
+ require('../node-forge/lib/x509'); f
31
+} catch (ex) { }
32
+
33
+if (forge == null) {
34
+ forge = require('./node_modules/node-forge/lib/forge');
35
+ require('./node_modules/node-forge/lib/aes');
36
+ require('./node_modules/node-forge/lib/asn1');
37
+ require('./node_modules/node-forge/lib/des');
38
+ require('./node_modules/node-forge/lib/oids');
39
+ require('./node_modules/node-forge/lib/pem');
40
+ require('./node_modules/node-forge/lib/pkcs7asn1');
41
+ require('./node_modules/node-forge/lib/random');
42
+ require('./node_modules/node-forge/lib/util');
43
+ require('./node_modules/node-forge/lib/x509');
44
+}
45
46
// shortcut for ASN.1 API
47
var asn1 = forge.asn1;