deps: update archs files for OpenSSL-1.1.1

After an OpenSSL source update, all the config files need to be regenerated and comitted by: $ cd deps/openssl/config $ make $ git add deps/openssl/config/archs $ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h $ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h $ git add deps/openssl/openssl/include/openssl/opensslconf.h $ git commit PR-URL: #29550 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Oct 9, 2019 · 5eb013b · 5eb013b
1 parent 1766cfc
commit 5eb013b
Show file tree

Hide file tree

Showing 197 changed files with 34,115 additions and 2,136 deletions.
diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm
@@ -48,7 +48,7 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AES_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1c",
-  version_num => "0x1010103fL",
+  version => "1.1.1d",
+  version_num => "0x1010104fL",
 );
 
 our %target = (
@@ -124,8 +124,8 @@ our %target = (
   RANLIB => "ranlib",
   RC => "windres",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
-  aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s",
-  aes_obj => "aes-586.o vpaes-x86.o aesni-x86.o",
+  aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
+  aes_obj => "aes_core.o aes_cbc.o vpaes-x86.o aesni-x86.o",
   apps_aux_src => "",
   apps_init_src => "",
   apps_obj => "",
@@ -1683,8 +1683,9 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "crypto/aes/aes-586.o",
+                            "crypto/aes/aes_cbc.o",
                             "crypto/aes/aes_cfb.o",
+                            "crypto/aes/aes_core.o",
                             "crypto/aes/aes_ecb.o",
                             "crypto/aes/aes_ige.o",
                             "crypto/aes/aes_misc.o",
@@ -3226,6 +3227,7 @@ our %unified_info = (
                             "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
+                            "test/testutil/random.o",
                             "test/testutil/stanza.o",
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
@@ -4839,12 +4841,6 @@ our %unified_info = (
                     "include",
                     "apps",
                 ],
-            "crypto/aes/aes-586.o" =>
-                [
-                    ".",
-                    "crypto/include",
-                    "include",
-                ],
             "crypto/aes/aes-armv4.o" =>
                 [
                     "crypto",
@@ -4861,12 +4857,24 @@ our %unified_info = (
                 [
                     "crypto",
                 ],
+            "crypto/aes/aes_cbc.o" =>
+                [
+                    ".",
+                    "crypto/include",
+                    "include",
+                ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
                     "crypto/include",
                     "include",
                 ],
+            "crypto/aes/aes_core.o" =>
+                [
+                    ".",
+                    "crypto/include",
+                    "include",
+                ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
@@ -9985,6 +9993,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/random.o" =>
+                [
+                    "include",
+                ],
             "test/testutil/stanza.o" =>
                 [
                     "include",
@@ -10618,14 +10630,18 @@ our %unified_info = (
                 [
                     "apps/x509.c",
                 ],
-            "crypto/aes/aes-586.o" =>
+            "crypto/aes/aes_cbc.o" =>
                 [
-                    "crypto/aes/aes-586.s",
+                    "crypto/aes/aes_cbc.c",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     "crypto/aes/aes_cfb.c",
                 ],
+            "crypto/aes/aes_core.o" =>
+                [
+                    "crypto/aes/aes_core.c",
+                ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     "crypto/aes/aes_ecb.c",
@@ -13319,8 +13335,9 @@ our %unified_info = (
                 ],
             "libcrypto" =>
                 [
-                    "crypto/aes/aes-586.o",
+                    "crypto/aes/aes_cbc.o",
                     "crypto/aes/aes_cfb.o",
+                    "crypto/aes/aes_core.o",
                     "crypto/aes/aes_ecb.o",
                     "crypto/aes/aes_ige.o",
                     "crypto/aes/aes_misc.o",
@@ -15223,6 +15240,7 @@ our %unified_info = (
                     "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
+                    "test/testutil/random.o",
                     "test/testutil/stanza.o",
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
@@ -15568,6 +15586,10 @@ our %unified_info = (
                 [
                     "test/testutil/output_helpers.c",
                 ],
+            "test/testutil/random.o" =>
+                [
+                    "test/testutil/random.c",
+                ],
             "test/testutil/stanza.o" =>
                 [
                     "test/testutil/stanza.c",

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: Mon Jul 22 14:54:03 2019 UTC"
+#define DATE "built on: Fri Sep 13 15:57:16 2019 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -36,13 +36,12 @@ static const char compiler_flags[] = {
     'M',' ','-','D','S','H','A','2','5','6','_','A','S','M',' ','-',
     'D','S','H','A','5','1','2','_','A','S','M',' ','-','D','R','C',
     '4','_','A','S','M',' ','-','D','M','D','5','_','A','S','M',' ',
-    '-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','A',
-    'E','S','_','A','S','M',' ','-','D','V','P','A','E','S','_','A',
-    'S','M',' ','-','D','W','H','I','R','L','P','O','O','L','_','A',
-    'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-',
-    'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S',
-    'M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',
-    ' ','-','D','_','T','H','R','E','A','D','_','S','A','F','E',' ',
-    '-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N',
-    'D','E','B','U','G','\0'
+    '-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','V',
+    'P','A','E','S','_','A','S','M',' ','-','D','W','H','I','R','L',
+    'P','O','O','L','_','A','S','M',' ','-','D','G','H','A','S','H',
+    '_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z',
+    '2','5','6','_','A','S','M',' ','-','D','P','O','L','Y','1','3',
+    '0','5','_','A','S','M',' ','-','D','_','T','H','R','E','A','D',
+    '_','S','A','F','E',' ','-','D','_','R','E','E','N','T','R','A',
+    'N','T',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi
@@ -15,7 +15,6 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
-      'AES_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',

diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
@@ -45,7 +45,9 @@
       'openssl/ssl/t1_trce.c',
       'openssl/ssl/tls13_enc.c',
       'openssl/ssl/tls_srp.c',
+      'openssl/crypto/aes/aes_cbc.c',
       'openssl/crypto/aes/aes_cfb.c',
+      'openssl/crypto/aes/aes_core.c',
       'openssl/crypto/aes/aes_ecb.c',
       'openssl/crypto/aes/aes_ige.c',
       'openssl/crypto/aes/aes_misc.c',
@@ -672,7 +674,6 @@
       'openssl/engines/e_padlock.c',
     ],
     'openssl_sources_BSD-x86': [
-      './config/archs/BSD-x86/asm/crypto/aes/aes-586.s',
       './config/archs/BSD-x86/asm/crypto/aes/aesni-x86.s',
       './config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.s',
       './config/archs/BSD-x86/asm/crypto/bf/bf-586.s',
@@ -712,7 +713,6 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
-      'AES_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',

diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
@@ -48,7 +48,7 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AES_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1c",
-  version_num => "0x1010103fL",
+  version => "1.1.1d",
+  version_num => "0x1010104fL",
 );
 
 our %target = (
@@ -124,8 +124,8 @@ our %target = (
   RANLIB => "ranlib",
   RC => "windres",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
-  aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s",
-  aes_obj => "aes-586.o vpaes-x86.o aesni-x86.o",
+  aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
+  aes_obj => "aes_core.o aes_cbc.o vpaes-x86.o aesni-x86.o",
   apps_aux_src => "",
   apps_init_src => "",
   apps_obj => "",
@@ -1683,8 +1683,9 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "crypto/aes/aes-586.o",
+                            "crypto/aes/aes_cbc.o",
                             "crypto/aes/aes_cfb.o",
+                            "crypto/aes/aes_core.o",
                             "crypto/aes/aes_ecb.o",
                             "crypto/aes/aes_ige.o",
                             "crypto/aes/aes_misc.o",
@@ -3226,6 +3227,7 @@ our %unified_info = (
                             "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
+                            "test/testutil/random.o",
                             "test/testutil/stanza.o",
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
@@ -4839,12 +4841,6 @@ our %unified_info = (
                     "include",
                     "apps",
                 ],
-            "crypto/aes/aes-586.o" =>
-                [
-                    ".",
-                    "crypto/include",
-                    "include",
-                ],
             "crypto/aes/aes-armv4.o" =>
                 [
                     "crypto",
@@ -4861,12 +4857,24 @@ our %unified_info = (
                 [
                     "crypto",
                 ],
+            "crypto/aes/aes_cbc.o" =>
+                [
+                    ".",
+                    "crypto/include",
+                    "include",
+                ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
                     "crypto/include",
                     "include",
                 ],
+            "crypto/aes/aes_core.o" =>
+                [
+                    ".",
+                    "crypto/include",
+                    "include",
+                ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
@@ -9985,6 +9993,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/random.o" =>
+                [
+                    "include",
+                ],
             "test/testutil/stanza.o" =>
                 [
                     "include",
@@ -10618,14 +10630,18 @@ our %unified_info = (
                 [
                     "apps/x509.c",
                 ],
-            "crypto/aes/aes-586.o" =>
+            "crypto/aes/aes_cbc.o" =>
                 [
-                    "crypto/aes/aes-586.s",
+                    "crypto/aes/aes_cbc.c",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     "crypto/aes/aes_cfb.c",
                 ],
+            "crypto/aes/aes_core.o" =>
+                [
+                    "crypto/aes/aes_core.c",
+                ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     "crypto/aes/aes_ecb.c",
@@ -13319,8 +13335,9 @@ our %unified_info = (
                 ],
             "libcrypto" =>
                 [
-                    "crypto/aes/aes-586.o",
+                    "crypto/aes/aes_cbc.o",
                     "crypto/aes/aes_cfb.o",
+                    "crypto/aes/aes_core.o",
                     "crypto/aes/aes_ecb.o",
                     "crypto/aes/aes_ige.o",
                     "crypto/aes/aes_misc.o",
@@ -15223,6 +15240,7 @@ our %unified_info = (
                     "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
+                    "test/testutil/random.o",
                     "test/testutil/stanza.o",
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
@@ -15568,6 +15586,10 @@ our %unified_info = (
                 [
                     "test/testutil/output_helpers.c",
                 ],
+            "test/testutil/random.o" =>
+                [
+                    "test/testutil/random.c",
+                ],
             "test/testutil/stanza.o" =>
                 [
                     "test/testutil/stanza.c",

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: Mon Jul 22 14:54:06 2019 UTC"
+#define DATE "built on: Fri Sep 13 15:57:23 2019 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -38,12 +38,11 @@ static const char compiler_flags[] = {
     ' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-','D',
     'R','C','4','_','A','S','M',' ','-','D','M','D','5','_','A','S',
     'M',' ','-','D','R','M','D','1','6','0','_','A','S','M',' ','-',
-    'D','A','E','S','_','A','S','M',' ','-','D','V','P','A','E','S',
-    '_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L',
-    '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
-    ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
-    'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A',
-    'S','M',' ','-','D','_','T','H','R','E','A','D','_','S','A','F',
-    'E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-',
-    'D','N','D','E','B','U','G','\0'
+    'D','V','P','A','E','S','_','A','S','M',' ','-','D','W','H','I',
+    'R','L','P','O','O','L','_','A','S','M',' ','-','D','G','H','A',
+    'S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I','S',
+    'T','Z','2','5','6','_','A','S','M',' ','-','D','P','O','L','Y',
+    '1','3','0','5','_','A','S','M',' ','-','D','_','T','H','R','E',
+    'A','D','_','S','A','F','E',' ','-','D','_','R','E','E','N','T',
+    'R','A','N','T',' ','-','D','N','D','E','B','U','G','\0'
 };