deps: regenerate OpenSSL arch files

Co-authored-by: Richard Lau <rlau@redhat.com> PR-URL: #40478 Refs: #40455 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
nodejs · Oct 18, 2021 · d434c53 · d434c53
1 parent 2cebd5f
commit d434c53
Show file tree

Hide file tree

Showing 324 changed files with 1,195 additions and 1,277 deletions.
diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm
@@ -206,7 +206,7 @@ our %config = (
     "patch" => "0",
     "perl_archname" => "x86_64-linux-thread-multi",
     "perl_cmd" => "/usr/bin/perl",
-    "perl_version" => "5.30.3",
+    "perl_version" => "5.32.1",
     "perlargv" => [
         "no-comp",
         "no-shared",
@@ -27216,8 +27216,8 @@ unless (caller) {
     use File::Copy;
     use Pod::Usage;
 
-    use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
-    use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
+    use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
+    use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
 
     my $here = dirname($0);
 
@@ -27244,7 +27244,7 @@ unless (caller) {
             );
 
         use lib '.';
-        use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
+        use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
         use gentemplate;
 
         print 'Creating ',$buildfile_template,"\n";
@@ -27261,8 +27261,8 @@ unless (caller) {
 
         my $prepend = <<'_____';
 use File::Spec::Functions;
-use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
-use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
+use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
+use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
 use lib '.';
 use platform;
 _____

diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86"
-#define DATE "built on: Wed Sep  8 06:02:47 2021 UTC"
+#define DATE "built on: Mon Oct 18 06:50:11 2021 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a

diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi
@@ -305,6 +305,7 @@
       './config/archs/BSD-x86/asm/crypto/des/crypt586.s',
       './config/archs/BSD-x86/asm/crypto/des/des-586.s',
       './config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
+      './config/archs/BSD-x86/asm/providers/legacy.ld',
       './config/archs/BSD-x86/asm/providers/fips.ld',
 
     ],
@@ -337,7 +338,7 @@
     'openssl_ex_libs_BSD-x86': [
       '-pthread',
     ],
-    'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
+    'linker_script': ''
   },
   'include_dirs': [
     '.',
@@ -349,7 +350,7 @@
   'defines': ['<@(openssl_defines_BSD-x86)'],
   'cflags': ['<@(openssl_cflags_BSD-x86)'],
   'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
-  'ldflags': ['-Wl,--version-script=<@(linker_script)'],
+
   'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
   'direct_dependent_settings': {
     'include_dirs': ['./include', '.'],

diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
@@ -940,6 +940,7 @@
       'openssl/providers/implementations/digests/wp_prov.c',
       'openssl/providers/implementations/kdfs/pbkdf1.c',
       'openssl/providers/prov_running.c',
+      'openssl/providers/legacyprov.c',
     ],
     'openssl_sources_BSD-x86': [
       './config/archs/BSD-x86/asm/crypto/aes/aes-586.s',
@@ -980,6 +981,7 @@
       './config/archs/BSD-x86/asm/crypto/des/crypt586.s',
       './config/archs/BSD-x86/asm/crypto/des/des-586.s',
       './config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
+      './config/archs/BSD-x86/asm/providers/legacy.ld',
       './config/archs/BSD-x86/asm/providers/fips.ld',
     ],
     'openssl_defines_BSD-x86': [

diff --git a/deps/openssl/config/archs/BSD-x86/asm/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86/asm/providers/legacy.ld
@@ -0,0 +1,5 @@
+{
+    global:
+        OSSL_provider_init;
+    local: *;
+};
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
@@ -206,7 +206,7 @@ our %config = (
     "patch" => "0",
     "perl_archname" => "x86_64-linux-thread-multi",
     "perl_cmd" => "/usr/bin/perl",
-    "perl_version" => "5.30.3",
+    "perl_version" => "5.32.1",
     "perlargv" => [
         "no-comp",
         "no-shared",
@@ -9714,10 +9714,10 @@ our %unified_info = (
         },
         "providers/fips" => {
             "deps" => [
-                "providers/fips/fips-dso-fips_entry.o",
                 "providers/fips/libfips-lib-fipsprov.o",
                 "providers/fips/libfips-lib-self_test.o",
-                "providers/fips/libfips-lib-self_test_kats.o"
+                "providers/fips/libfips-lib-self_test_kats.o",
+                "providers/fips/fips-dso-fips_entry.o"
             ],
             "products" => {
                 "dso" => [
@@ -27216,8 +27216,8 @@ unless (caller) {
     use File::Copy;
     use Pod::Usage;
 
-    use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
-    use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
+    use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
+    use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
 
     my $here = dirname($0);
 
@@ -27244,7 +27244,7 @@ unless (caller) {
             );
 
         use lib '.';
-        use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
+        use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
         use gentemplate;
 
         print 'Creating ',$buildfile_template,"\n";
@@ -27261,8 +27261,8 @@ unless (caller) {
 
         my $prepend = <<'_____';
 use File::Spec::Functions;
-use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
-use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
+use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
+use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
 use lib '.';
 use platform;
 _____

diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86"
-#define DATE "built on: Wed Sep  8 06:02:59 2021 UTC"
+#define DATE "built on: Mon Oct 18 06:50:27 2021 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a

diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi
@@ -305,6 +305,7 @@
       './config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s',
       './config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s',
       './config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s',
+      './config/archs/BSD-x86/asm_avx2/providers/legacy.ld',
       './config/archs/BSD-x86/asm_avx2/providers/fips.ld',
 
     ],
@@ -337,7 +338,7 @@
     'openssl_ex_libs_BSD-x86': [
       '-pthread',
     ],
-    'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
+    'linker_script': ''
   },
   'include_dirs': [
     '.',
@@ -349,7 +350,7 @@
   'defines': ['<@(openssl_defines_BSD-x86)'],
   'cflags': ['<@(openssl_cflags_BSD-x86)'],
   'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
-  'ldflags': ['-Wl,--version-script=<@(linker_script)'],
+
   'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
   'direct_dependent_settings': {
     'include_dirs': ['./include', '.'],

diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi
@@ -940,6 +940,7 @@
       'openssl/providers/implementations/digests/wp_prov.c',
       'openssl/providers/implementations/kdfs/pbkdf1.c',
       'openssl/providers/prov_running.c',
+      'openssl/providers/legacyprov.c',
     ],
     'openssl_sources_BSD-x86': [
       './config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s',
@@ -980,6 +981,7 @@
       './config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s',
       './config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s',
       './config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s',
+      './config/archs/BSD-x86/asm_avx2/providers/legacy.ld',
       './config/archs/BSD-x86/asm_avx2/providers/fips.ld',
     ],
     'openssl_defines_BSD-x86': [

diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86/asm_avx2/providers/legacy.ld
@@ -0,0 +1,5 @@
+{
+    global:
+        OSSL_provider_init;
+    local: *;
+};
diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
@@ -205,7 +205,7 @@ our %config = (
     "patch" => "0",
     "perl_archname" => "x86_64-linux-thread-multi",
     "perl_cmd" => "/usr/bin/perl",
-    "perl_version" => "5.30.3",
+    "perl_version" => "5.32.1",
     "perlargv" => [
         "no-comp",
         "no-shared",
@@ -7937,9 +7937,6 @@ our %unified_info = (
         },
         "apps/lib" => {
             "deps" => [
-                "apps/lib/openssl-bin-cmp_mock_srv.o",
-                "apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
-                "apps/lib/uitest-bin-apps_ui.o",
                 "apps/lib/libapps-lib-app_libctx.o",
                 "apps/lib/libapps-lib-app_params.o",
                 "apps/lib/libapps-lib-app_provider.o",
@@ -7957,7 +7954,10 @@ our %unified_info = (
                 "apps/lib/libapps-lib-s_cb.o",
                 "apps/lib/libapps-lib-s_socket.o",
                 "apps/lib/libapps-lib-tlssrp_depr.o",
-                "apps/lib/libtestutil-lib-opt.o"
+                "apps/lib/libtestutil-lib-opt.o",
+                "apps/lib/openssl-bin-cmp_mock_srv.o",
+                "apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
+                "apps/lib/uitest-bin-apps_ui.o"
             ],
             "products" => {
                 "bin" => [
@@ -9632,10 +9632,10 @@ our %unified_info = (
         },
         "providers/fips" => {
             "deps" => [
-                "providers/fips/fips-dso-fips_entry.o",
                 "providers/fips/libfips-lib-fipsprov.o",
                 "providers/fips/libfips-lib-self_test.o",
-                "providers/fips/libfips-lib-self_test_kats.o"
+                "providers/fips/libfips-lib-self_test_kats.o",
+                "providers/fips/fips-dso-fips_entry.o"
             ],
             "products" => {
                 "dso" => [
@@ -27033,8 +27033,8 @@ unless (caller) {
     use File::Copy;
     use Pod::Usage;
 
-    use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
-    use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
+    use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
+    use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
 
     my $here = dirname($0);
 
@@ -27061,7 +27061,7 @@ unless (caller) {
             );
 
         use lib '.';
-        use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
+        use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
         use gentemplate;
 
         print 'Creating ',$buildfile_template,"\n";
@@ -27078,8 +27078,8 @@ unless (caller) {
 
         my $prepend = <<'_____';
 use File::Spec::Functions;
-use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
-use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
+use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
+use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
 use lib '.';
 use platform;
 _____

diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86"
-#define DATE "built on: Wed Sep  8 06:03:11 2021 UTC"
+#define DATE "built on: Mon Oct 18 06:50:42 2021 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a

diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi
@@ -279,6 +279,7 @@
       './config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c',
       './config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c',
       './config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c',
+      './config/archs/BSD-x86/no-asm/providers/legacy.ld',
       './config/archs/BSD-x86/no-asm/providers/fips.ld',
 
     ],
@@ -297,7 +298,7 @@
     'openssl_ex_libs_BSD-x86': [
       '-pthread',
     ],
-    'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
+    'linker_script': ''
   },
   'include_dirs': [
     '.',
@@ -309,7 +310,7 @@
   'defines': ['<@(openssl_defines_BSD-x86)'],
   'cflags': ['<@(openssl_cflags_BSD-x86)'],
   'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
-  'ldflags': ['-Wl,--version-script=<@(linker_script)'],
+
   'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
   'direct_dependent_settings': {
     'include_dirs': ['./include', '.'],

diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi
@@ -955,6 +955,7 @@
       'openssl/providers/implementations/digests/wp_prov.c',
       'openssl/providers/implementations/kdfs/pbkdf1.c',
       'openssl/providers/prov_running.c',
+      'openssl/providers/legacyprov.c',
     ],
     'openssl_sources_BSD-x86': [
       './config/archs/BSD-x86/no-asm/providers/common/der/der_sm2_gen.c',
@@ -964,6 +965,7 @@
       './config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c',
       './config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c',
       './config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c',
+      './config/archs/BSD-x86/no-asm/providers/legacy.ld',
       './config/archs/BSD-x86/no-asm/providers/fips.ld',
     ],
     'openssl_defines_BSD-x86': [

diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86/no-asm/providers/legacy.ld
@@ -0,0 +1,5 @@
+{
+    global:
+        OSSL_provider_init;
+    local: *;
+};