From ffb6f4d51d466f8b04135a570c48af1f9e1fd265 Mon Sep 17 00:00:00 2001
From: Michael Dawson <mdawson@devrus.com>
Date: Thu, 8 Sep 2022 15:58:54 -0400
Subject: [PATCH] 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: https://github.com/nodejs-private/node-private/pull/345
CVE-ID: CVE-2022-32222
---
 deps/openssl/openssl.gyp         | 5 -----
 deps/openssl/openssl_common.gypi | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index 7b1278044e7a70..861bbc5844ca7b 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -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',
       }],
     ],
   },
@@ -57,7 +53,6 @@
         ['node_shared_openssl=="false"', {
           'defines': [
             'MODULESDIR="<(modules_dir)"',
-            'OPENSSLDIR="<(openssl_dir)"',
           ]
         }],
       ],
diff --git a/deps/openssl/openssl_common.gypi b/deps/openssl/openssl_common.gypi
index d4e39e84169c5e..256eb7d1808db3 100644
--- a/deps/openssl/openssl_common.gypi
+++ b/deps/openssl/openssl_common.gypi
@@ -49,6 +49,7 @@
         'WARNING_CFLAGS': ['-Wno-missing-field-initializers']
       },
       'defines': [
+        'OPENSSLDIR="/System/Library/OpenSSL/"',
         'ENGINESDIR="/dev/null"',
       ],
     }, 'OS=="solaris"', {