From a799b9855a6ff0178fe9668b58e5e988de0dcfd1 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Sun, 29 May 2022 11:50:20 -0700
Subject: [PATCH] Fixed forge path issue, #4049

---
 pkcs7-modified.js | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pkcs7-modified.js b/pkcs7-modified.js
index 3ae55d09..661904a6 100644
--- a/pkcs7-modified.js
+++ b/pkcs7-modified.js
@@ -16,16 +16,32 @@
  * a separate file pkcs7asn1.js, since those are referenced from other
  * PKCS standards like PKCS #12.
  */
-var forge = require('./node_modules/node-forge/lib/forge');
-require('./node_modules/node-forge/lib/aes');
-require('./node_modules/node-forge/lib/asn1');
-require('./node_modules/node-forge/lib/des');
-require('./node_modules/node-forge/lib/oids');
-require('./node_modules/node-forge/lib/pem');
-require('./node_modules/node-forge/lib/pkcs7asn1');
-require('./node_modules/node-forge/lib/random');
-require('./node_modules/node-forge/lib/util');
-require('./node_modules/node-forge/lib/x509');
+var forge;
+try {
+    forge = require('../node-forge/lib/forge');
+    require('../node-forge/lib/aes');
+    require('../node-forge/lib/asn1');
+    require('../node-forge/lib/des');
+    require('../node-forge/lib/oids');
+    require('../node-forge/lib/pem');
+    require('../node-forge/lib/pkcs7asn1');
+    require('../node-forge/lib/random');
+    require('../node-forge/lib/util');
+    require('../node-forge/lib/x509'); f
+} catch (ex) { }
+
+if (forge == null) {
+    forge = require('./node_modules/node-forge/lib/forge');
+    require('./node_modules/node-forge/lib/aes');
+    require('./node_modules/node-forge/lib/asn1');
+    require('./node_modules/node-forge/lib/des');
+    require('./node_modules/node-forge/lib/oids');
+    require('./node_modules/node-forge/lib/pem');
+    require('./node_modules/node-forge/lib/pkcs7asn1');
+    require('./node_modules/node-forge/lib/random');
+    require('./node_modules/node-forge/lib/util');
+    require('./node_modules/node-forge/lib/x509');
+}
 
 // shortcut for ASN.1 API
 var asn1 = forge.asn1;