deps: fix gyp/gypi for openssl-1.1.1

Some of defines and cppflags in the build config of OpenSSL-1.1.1 were
moved to new attributes. Gyp and gypi file generations are needed to be
fixed to include them.

PR-URL: https://github.com/nodejs/node/pull/25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>

4 files changed, 39 insertions, 0 deletions

diff --git a/deps/openssl/config/generate_gypi.pl b/deps/openssl/config/generate_gypi.pl
index 5c50c9953d..00bcaf5b9c 100755
--- a/deps/openssl/config/generate_gypi.pl
+++ b/deps/openssl/config/generate_gypi.pl
@@ -115,6 +115,9 @@ foreach my $src (@generated_srcs) {
   system("$cmd") == 0 or die "Error in system($cmd)";
 }
 
+$target{'lib_cppflags'} =~ s/-D//g;
+my @lib_cppflags = split(/ /, $target{'lib_cppflags'});
+
 # Create openssl.gypi
 my $template =
     Text::Template->new(TYPE => 'FILE',
@@ -131,6 +134,7 @@ my $gypi = $template->fill_in(
         target => \%target,
         asm => \$asm,
         arch => \$arch,
+        lib_cppflags => \@lib_cppflags,
         is_win => \$is_win,
     });
 
@@ -152,6 +156,7 @@ my $clgypi = $cltemplate->fill_in(
         config => \%config,
         target => \%target,
         arch => \$arch,
+        lib_cppflags => \@lib_cppflags,
         is_win => \$is_win,
     });
 
diff --git a/deps/openssl/config/openssl-cl.gypi.tmpl b/deps/openssl/config/openssl-cl.gypi.tmpl
index d658e3b2de..58c907e3aa 100644
--- a/deps/openssl/config/openssl-cl.gypi.tmpl
+++ b/deps/openssl/config/openssl-cl.gypi.tmpl
@@ -2,10 +2,26 @@
   'variables': {
     'openssl_defines_%%-$arch-%%': [
 %%- foreach $define (@{$config{defines}}) {
+      $OUT .= "      '$define',\n";
+    }
+    foreach $define (@lib_cppflags) {
+      $OUT .= "      '$define',\n";
+    }
+    foreach $define (@{$target{defines}}) {
+      $OUT .= "      '$define',\n";
+    }
+    foreach $define (@{$config{lib_defines}}) {
   $OUT .= "      '$define',\n";
 } -%%    ],
     'openssl_cflags_%%-$arch-%%': [
+%%- foreach $cflag (@{$config{cflags}}) {
+      $OUT .= "      '$cflag',\n";
+    }
+    foreach $cflag (@{$config{CFLAGS}}) {
+      $OUT .= "      '$cflag',\n";
+    } -%%
       '%%-$target{cflags}-%%',
+      '%%-$target{CFLAGS}-%%',
     ],
     'openssl_ex_libs_%%-$arch-%%': [
       '%%-$target{ex_libs}-%%',
diff --git a/deps/openssl/config/openssl.gypi.tmpl b/deps/openssl/config/openssl.gypi.tmpl
index 4547b77e10..4426879b5b 100644
--- a/deps/openssl/config/openssl.gypi.tmpl
+++ b/deps/openssl/config/openssl.gypi.tmpl
@@ -13,10 +13,26 @@ foreach $src (@libcrypto_srcs) {
 } -%%    ],
     'openssl_defines_%%-$arch-%%': [
 %%- foreach $define (@{$config{defines}}) {
+      $OUT .= "      '$define',\n";
+    }
+    foreach $define (@lib_cppflags) {
+      $OUT .= "      '$define',\n";
+    }
+    foreach $define (@{$target{defines}}) {
+      $OUT .= "      '$define',\n";
+    }
+    foreach $define (@{$config{lib_defines}}) {
   $OUT .= "      '$define',\n";
 } -%%    ],
     'openssl_cflags_%%-$arch-%%': [
+%%- foreach $cflag (@{$config{cflags}}) {
+      $OUT .= "      '$cflag',\n";
+    }
+    foreach $cflag (@{$config{CFLAGS}}) {
+      $OUT .= "      '$cflag',\n";
+    } -%%
       '%%-$target{cflags}-%%',
+      '%%-$target{CFLAGS}-%%',
     ],
     'openssl_ex_libs_%%-$arch-%%': [
       '%%-$target{ex_libs}-%%',
diff --git a/deps/openssl/openssl_common.gypi b/deps/openssl/openssl_common.gypi
index 252570006a..75002e87c2 100644
--- a/deps/openssl/openssl_common.gypi
+++ b/deps/openssl/openssl_common.gypi
@@ -5,6 +5,8 @@
     'openssl/crypto/',
     'openssl/crypto/include/',
     'openssl/crypto/modes/',
+    'openssl/crypto/ec/curve448',
+    'openssl/crypto/ec/curve448/arch_32',
     'config/',
   ],
   # build options specific to OS