Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1d
Browse files Browse the repository at this point in the history 
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: #29921
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
  • Loading branch information
@sam-github @BethGriggs
sam-github authored and BethGriggs committed Oct 16, 2019
1 parent 9c393f1 commit 7202792
Show file tree
Hide file tree
Showing 163 changed files with 1,602 additions and 994 deletions.
54 changes: 32 additions & 22 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 = (
Expand All @@ -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 => "",
Expand Down Expand Up @@ -1693,8 +1693,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",
Expand All @@ -1704,7 +1705,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" =>
Expand Down Expand Up @@ -3260,6 +3260,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",
Expand Down Expand Up @@ -4901,7 +4902,7 @@ our %unified_info = (
[
"crypto",
],
"crypto/aes/aes-x86_64.o" =>
"crypto/aes/aes_cbc.o" =>
[
".",
"crypto/include",
Expand All @@ -4913,6 +4914,12 @@ our %unified_info = (
"crypto/include",
"include",
],
"crypto/aes/aes_core.o" =>
[
".",
"crypto/include",
"include",
],
"crypto/aes/aes_ecb.o" =>
[
".",
Expand Down Expand Up @@ -4983,12 +4990,6 @@ our %unified_info = (
[
"crypto",
],
"crypto/aes/bsaes-x86_64.o" =>
[
".",
"crypto/include",
"include",
],
"crypto/aes/vpaes-x86_64.o" =>
[
".",
Expand Down Expand Up @@ -10097,6 +10098,10 @@ our %unified_info = (
[
"include",
],
"test/testutil/random.o" =>
[
"include",
],
"test/testutil/stanza.o" =>
[
"include",
Expand Down Expand Up @@ -10730,14 +10735,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",
Expand Down Expand Up @@ -10774,10 +10783,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",
Expand Down Expand Up @@ -13475,8 +13480,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",
Expand All @@ -13486,7 +13492,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",
Expand Down Expand Up @@ -15390,6 +15395,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",
Expand Down Expand Up @@ -15735,6 +15741,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",
Expand Down
19 changes: 9 additions & 10 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Thu Jun 13 19:22:10 2019 UTC"
#define DATE "built on: Thu Oct 10 15:43:19 2019 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand All @@ -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'
};
2 changes: 0 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
'KECCAK1600_ASM',
'RC4_ASM',
'MD5_ASM',
'AES_ASM',
'VPAES_ASM',
'BSAES_ASM',
'GHASH_ASM',
'ECP_NISTZ256_ASM',
'X25519_ASM',
Expand Down
6 changes: 2 additions & 4 deletions deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -723,9 +723,7 @@
'KECCAK1600_ASM',
'RC4_ASM',
'MD5_ASM',
'AES_ASM',
'VPAES_ASM',
'BSAES_ASM',
'GHASH_ASM',
'ECP_NISTZ256_ASM',
'X25519_ASM',
Expand Down

0 comments on commit 7202792

Please sign in to comment.