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: https://github.com/nodejs/node/pull/29550
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>

4 files changed, 42 insertions, 41 deletions

diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm
index 0ffd375cdc..32bcc2c466 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/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_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AES_ASM", "VPAES_ASM", "BSAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "darwin64-x86_64-cc",
   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 -c",
   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-x86_64.s vpaes-x86_64.s bsaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
-  aes_obj => "aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o",
+  aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
+  aes_obj => "aes_core.o aes_cbc.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o",
   apps_aux_src => "",
   apps_init_src => "",
   apps_obj => "",
@@ -1684,8 +1684,9 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "crypto/aes/aes-x86_64.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",
@@ -1695,7 +1696,6 @@ our %unified_info = (
                             "crypto/aes/aesni-sha1-x86_64.o",
                             "crypto/aes/aesni-sha256-x86_64.o",
                             "crypto/aes/aesni-x86_64.o",
-                            "crypto/aes/bsaes-x86_64.o",
                             "crypto/aes/vpaes-x86_64.o",
                         ],
                     "products" =>
@@ -3250,6 +3250,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",
@@ -4879,7 +4880,7 @@ our %unified_info = (
                 [
                     "crypto",
                 ],
-            "crypto/aes/aes-x86_64.o" =>
+            "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
                     "crypto/include",
@@ -4891,6 +4892,12 @@ our %unified_info = (
                     "crypto/include",
                     "include",
                 ],
+            "crypto/aes/aes_core.o" =>
+                [
+                    ".",
+                    "crypto/include",
+                    "include",
+                ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
@@ -4961,12 +4968,6 @@ our %unified_info = (
                 [
                     "crypto",
                 ],
-            "crypto/aes/bsaes-x86_64.o" =>
-                [
-                    ".",
-                    "crypto/include",
-                    "include",
-                ],
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
@@ -7929,10 +7930,6 @@ our %unified_info = (
                 [
                     "crypto",
                 ],
-            "crypto/poly1305/poly1305-s390x.o" =>
-                [
-                    "crypto",
-                ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
                 [
                     "crypto",
@@ -10073,6 +10070,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/random.o" =>
+                [
+                    "include",
+                ],
             "test/testutil/stanza.o" =>
                 [
                     "include",
@@ -10706,14 +10707,18 @@ our %unified_info = (
                 [
                     "apps/x509.c",
                 ],
-            "crypto/aes/aes-x86_64.o" =>
+            "crypto/aes/aes_cbc.o" =>
                 [
-                    "crypto/aes/aes-x86_64.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",
@@ -10750,10 +10755,6 @@ our %unified_info = (
                 [
                     "crypto/aes/aesni-x86_64.s",
                 ],
-            "crypto/aes/bsaes-x86_64.o" =>
-                [
-                    "crypto/aes/bsaes-x86_64.s",
-                ],
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     "crypto/aes/vpaes-x86_64.s",
@@ -13447,8 +13448,9 @@ our %unified_info = (
                 ],
             "libcrypto" =>
                 [
-                    "crypto/aes/aes-x86_64.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",
@@ -13458,7 +13460,6 @@ our %unified_info = (
                     "crypto/aes/aesni-sha1-x86_64.o",
                     "crypto/aes/aesni-sha256-x86_64.o",
                     "crypto/aes/aesni-x86_64.o",
-                    "crypto/aes/bsaes-x86_64.o",
                     "crypto/aes/vpaes-x86_64.o",
                     "crypto/aria/aria.o",
                     "crypto/asn1/a_bitstr.o",
@@ -15361,6 +15362,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",
@@ -15706,6 +15708,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/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h
index 5d824a8fb0..da2e3d5150 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin64-x86_64-cc"
-#define DATE "built on: Wed Jun 12 20:53:57 2019 UTC"
+#define DATE "built on: Fri Sep 13 15:58:21 2019 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -36,12 +36,11 @@ static const char compiler_flags[] = {
     'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A',
     '5','1','2','_','A','S','M',' ','-','D','K','E','C','C','A','K',
     '1','6','0','0','_','A','S','M',' ','-','D','R','C','4','_','A',
-    'S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','A',
-    'E','S','_','A','S','M',' ','-','D','V','P','A','E','S','_','A',
-    'S','M',' ','-','D','B','S','A','E','S','_','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',
-    'X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L',
-    'Y','1','3','0','5','_','A','S','M',' ','-','D','_','R','E','E',
-    'N','T','R','A','N','T',' ','-','D','N','D','E','B','U','G','\0'
+    'S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','V',
+    'P','A','E','S','_','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','X','2','5','5','1','9',
+    '_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_',
+    'A','S','M',' ','-','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/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi
index 48d7158e61..95e8dc567e 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi
@@ -15,9 +15,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
-      'AES_ASM',
       'VPAES_ASM',
-      'BSAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
       'X25519_ASM',
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi
index 46a42c7ec4..be4971efb1 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/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',
@@ -675,12 +677,10 @@
       'openssl/engines/e_padlock.c',
     ],
     'openssl_sources_darwin64-x86_64-cc': [
-      './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s',
       './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-mb-x86_64.s',
       './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s',
       './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s',
       './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s',
-      './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/bsaes-x86_64.s',
       './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/vpaes-x86_64.s',
       './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-avx2.s',
       './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s',
@@ -722,9 +722,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
-      'AES_ASM',
       'VPAES_ASM',
-      'BSAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
       'X25519_ASM',