diff options
Diffstat (limited to 'deps/openssl/config/archs/BSD-x86_64')
10 files changed, 99 insertions, 91 deletions
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index 068dd9fb50..958b30cc6a 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/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)gcc", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86_64", 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/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 => "", @@ -1692,8 +1692,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", @@ -1703,7 +1704,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" => @@ -3259,6 +3259,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", @@ -4900,7 +4901,7 @@ our %unified_info = ( [ "crypto", ], - "crypto/aes/aes-x86_64.o" => + "crypto/aes/aes_cbc.o" => [ ".", "crypto/include", @@ -4912,6 +4913,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/aes/aes_core.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/aes/aes_ecb.o" => [ ".", @@ -4982,12 +4989,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/aes/bsaes-x86_64.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/aes/vpaes-x86_64.o" => [ ".", @@ -7956,10 +7957,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/poly1305/poly1305-s390x.o" => - [ - "crypto", - ], "crypto/poly1305/poly1305-sparcv9.o" => [ "crypto", @@ -10100,6 +10097,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/random.o" => + [ + "include", + ], "test/testutil/stanza.o" => [ "include", @@ -10733,14 +10734,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", @@ -10777,10 +10782,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", @@ -13478,8 +13479,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", @@ -13489,7 +13491,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", @@ -15393,6 +15394,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", @@ -15738,6 +15740,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_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index 0c62ca8d17..3eb8d7ca6b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Jun 12 20:53:27 2019 UTC" +#define DATE "built on: Fri Sep 13 15:57:33 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -35,13 +35,12 @@ static const char compiler_flags[] = { '_','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','_','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','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', + '_','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_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi index fc37c33c96..046ed1ab79 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/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/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index cbfe13a905..08b438900a 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/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', @@ -676,12 +678,10 @@ 'openssl/engines/e_padlock.c', ], 'openssl_sources_BSD-x86_64': [ - './config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s', './config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s', './config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s', './config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s', './config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s', - './config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s', './config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s', './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s', './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s', @@ -723,9 +723,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/BSD-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm index 2cbfd33097..bf9459acad 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/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 => "BSD-x86_64", 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/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 => "", @@ -1692,8 +1692,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", @@ -1703,7 +1704,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" => @@ -3259,6 +3259,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", @@ -4900,7 +4901,7 @@ our %unified_info = ( [ "crypto", ], - "crypto/aes/aes-x86_64.o" => + "crypto/aes/aes_cbc.o" => [ ".", "crypto/include", @@ -4912,6 +4913,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/aes/aes_core.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/aes/aes_ecb.o" => [ ".", @@ -4982,12 +4989,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/aes/bsaes-x86_64.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/aes/vpaes-x86_64.o" => [ ".", @@ -7956,10 +7957,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/poly1305/poly1305-s390x.o" => - [ - "crypto", - ], "crypto/poly1305/poly1305-sparcv9.o" => [ "crypto", @@ -10100,6 +10097,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/random.o" => + [ + "include", + ], "test/testutil/stanza.o" => [ "include", @@ -10733,14 +10734,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", @@ -10777,10 +10782,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", @@ -13478,8 +13479,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", @@ -13489,7 +13491,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", @@ -15393,6 +15394,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", @@ -15738,6 +15740,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_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h index 2692ef00bb..c9ffd0c3c0 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Jun 12 20:53:36 2019 UTC" +#define DATE "built on: Fri Sep 13 15:57:48 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -36,13 +36,12 @@ static const char compiler_flags[] = { '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','_','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','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','_','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_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi index fc37c33c96..046ed1ab79 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/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/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi index 883e23c2be..e9ccff9647 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/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', @@ -676,12 +678,10 @@ 'openssl/engines/e_padlock.c', ], 'openssl_sources_BSD-x86_64': [ - './config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s', './config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-mb-x86_64.s', './config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s', './config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s', './config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s', './config/archs/BSD-x86_64/asm_avx2/crypto/aes/vpaes-x86_64.s', './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-avx2.s', './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s', @@ -723,9 +723,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/BSD-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index 8a783acc3d..84e3b18753 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -3221,6 +3221,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", @@ -7828,10 +7829,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/poly1305/poly1305-s390x.o" => - [ - "crypto", - ], "crypto/poly1305/poly1305-sparcv9.o" => [ "crypto", @@ -9924,6 +9921,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/random.o" => + [ + "include", + ], "test/testutil/stanza.o" => [ "include", @@ -15102,6 +15103,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", @@ -15447,6 +15449,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_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index 9ef21c3c40..7702df5969 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Jun 12 20:53:45 2019 UTC" +#define DATE "built on: Fri Sep 13 15:58:03 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a |