Skip to content

Commit a746943

Browse files
RafaelGSSRafaelGSS
committed
deps: update archs files for OpenSSL-1.1.1o
After an OpenSSL source update, all the config files need to be regenerated and committed by: $ make -C deps/openssl/config $ git add deps/openssl/config/archs $ git add deps/openssl/openssl/include/crypto/bn_conf.h $ git add deps/openssl/openssl/include/crypto/dso_conf.h $ git add deps/openssl/openssl/include/openssl/opensslconf.h $ git commit PR-URL: #42957 Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-May/000223.html Reviewed-By: Beth Griggs <[email protected]>
1 parent 6efc844 commit a746943

File tree

133 files changed

+308
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+308
-324
lines changed

‎deps/openssl/config/archs/BSD-x86/asm/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ our %config = (
6262
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.28.1",
65+
perl_version => "5.30.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1n+quic",
115-
version_num => "0x101010efL",
114+
version => "1.1.1o+quic",
115+
version_num => "0x101010ffL",
116116
);
117117

118118
our %target = (

‎deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Tue Mar 15 19:21:51 2022 UTC"
14+
#define DATE "built on: Tue May 3 19:55:35 2022 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ our %config = (
5151
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", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
5252
libdir => "",
5353
major => "1",
54-
makedepprog => "",
54+
makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
5555
minor => "1.1",
5656
openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
5757
openssl_api_defines => [ ],
5858
openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
5959
openssl_sys_defines => [ ],
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
62-
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-makedepend no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
62+
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.28.1",
65+
perl_version => "5.30.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1n+quic",
115-
version_num => "0x101010efL",
114+
version => "1.1.1o+quic",
115+
version_num => "0x101010ffL",
116116
);
117117

118118
our %target = (
@@ -331,7 +331,6 @@ our %disabled = (
331331
"fuzz-afl" => "default",
332332
"fuzz-libfuzzer" => "default",
333333
"heartbeats" => "default",
334-
"makedepend" => "unavailable",
335334
"md2" => "default",
336335
"msan" => "default",
337336
"rc5" => "default",

‎deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Tue Mar 15 19:21:54 2022 UTC"
14+
#define DATE "built on: Tue May 3 19:55:37 2022 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ our %config = (
6161
options => "enable-ssl-trace no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6262
perl_archname => "x86_64-linux-gnu-thread-multi",
6363
perl_cmd => "/usr/bin/perl",
64-
perl_version => "5.28.1",
64+
perl_version => "5.30.0",
6565
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "no-asm", "BSD-x86" ],
6666
perlenv => {
6767
"AR" => undef,
@@ -110,8 +110,8 @@ our %config = (
110110
sourcedir => ".",
111111
target => "BSD-x86",
112112
tdirs => [ "ossl_shim" ],
113-
version => "1.1.1n+quic",
114-
version_num => "0x101010efL",
113+
version => "1.1.1o+quic",
114+
version_num => "0x101010ffL",
115115
);
116116

117117
our %target = (

‎deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Tue Mar 15 19:21:57 2022 UTC"
14+
#define DATE "built on: Tue May 3 19:55:40 2022 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ our %config = (
6262
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.28.1",
65+
perl_version => "5.30.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86_64" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1n+quic",
115-
version_num => "0x101010efL",
114+
version => "1.1.1o+quic",
115+
version_num => "0x101010ffL",
116116
);
117117

118118
our %target = (

‎deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86_64"
14-
#define DATE "built on: Tue Mar 15 19:21:59 2022 UTC"
14+
#define DATE "built on: Tue May 3 19:55:41 2022 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ our %config = (
5151
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", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
5252
libdir => "",
5353
major => "1",
54-
makedepprog => "",
54+
makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
5555
minor => "1.1",
5656
openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
5757
openssl_api_defines => [ ],
5858
openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
5959
openssl_sys_defines => [ ],
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
62-
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-makedepend no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
62+
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.28.1",
65+
perl_version => "5.30.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86_64" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1n+quic",
115-
version_num => "0x101010efL",
114+
version => "1.1.1o+quic",
115+
version_num => "0x101010ffL",
116116
);
117117

118118
our %target = (
@@ -332,7 +332,6 @@ our %disabled = (
332332
"fuzz-afl" => "default",
333333
"fuzz-libfuzzer" => "default",
334334
"heartbeats" => "default",
335-
"makedepend" => "unavailable",
336335
"md2" => "default",
337336
"msan" => "default",
338337
"rc5" => "default",

‎deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86_64"
14-
#define DATE "built on: Tue Mar 15 19:22:05 2022 UTC"
14+
#define DATE "built on: Tue May 3 19:55:45 2022 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

0 commit comments

Comments
 (0)