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 <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Rafael Gonzaga <[email protected]>
PR-URL: nodejs-private/node-private#345
CVE-ID: CVE-2022-32222

Author: mhdawson

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)"',
           ]
         }],
       ],

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"', {