Skip to content

Commit

Permalink
deps: MacOS - fix location of OpenSSL config file
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
mhdawson authored and RafaelGSS committed Sep 16, 2022
1 parent 2c379d3 commit ffb6f4d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
5 changes: 0 additions & 5 deletions deps/openssl/openssl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,17 @@
'conditions': [
['OS == "win"', {
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj/lib',
}],
['GENERATOR == "ninja"', {
'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
'modules_dir': '<(PRODUCT_DIR_ABS)/obj/lib/openssl-modules',
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj/lib',
}, {
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules',
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl',
}],
['OS=="mac"', {
'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules',
'openssl_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl',
}],
],
},
Expand Down Expand Up @@ -57,7 +53,6 @@
['node_shared_openssl=="false"', {
'defines': [
'MODULESDIR="<(modules_dir)"',
'OPENSSLDIR="<(openssl_dir)"',
]
}],
],
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/openssl_common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
'WARNING_CFLAGS': ['-Wno-missing-field-initializers']
},
'defines': [
'OPENSSLDIR="/System/Library/OpenSSL/"',
'ENGINESDIR="/dev/null"',
],
}, 'OS=="solaris"', {
Expand Down

0 comments on commit ffb6f4d

Please sign in to comment.