Skip to content

Commit ffb6f4d

Browse files
mhdawsonRafaelGSS
authored andcommittedSep 16, 2022
deps: MacOS - fix location of OpenSSL config file
- Restore the location were the OpenSSL config file is loaded by default on MacOS back to where it was on earlier versions - Remove warnings about OPENSSLDIR being multiply defined Signed-off-by: Michael Dawson <mdawson@devrus.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> PR-URL: nodejs-private/node-private#345 CVE-ID: CVE-2022-32222
1 parent 2c379d3 commit ffb6f4d

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed
 

‎deps/openssl/openssl.gyp

-5
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@
77
'conditions': [
88
['OS == "win"', {
99
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
10-
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj/lib',
1110
}],
1211
['GENERATOR == "ninja"', {
1312
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
1413
'modules_dir': '<(PRODUCT_DIR_ABS)/obj/lib/openssl-modules',
15-
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj/lib',
1614
}, {
1715
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
1816
'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules',
19-
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl',
2017
}],
2118
['OS=="mac"', {
2219
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
2320
'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules',
24-
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl',
2521
}],
2622
],
2723
},
@@ -57,7 +53,6 @@
5753
['node_shared_openssl=="false"', {
5854
'defines': [
5955
'MODULESDIR="<(modules_dir)"',
60-
'OPENSSLDIR="<(openssl_dir)"',
6156
]
6257
}],
6358
],

‎deps/openssl/openssl_common.gypi

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
'WARNING_CFLAGS': ['-Wno-missing-field-initializers']
5050
},
5151
'defines': [
52+
'OPENSSLDIR="/System/Library/OpenSSL/"',
5253
'ENGINESDIR="/dev/null"',
5354
],
5455
}, 'OS=="solaris"', {

0 commit comments

Comments
 (0)
Please sign in to comment.