Skip to content

Commit 3924618

Browse files
hassaanprichardlau
authored andcommitted
deps: update archs files for OpenSSL-1.1.1
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: #42352 Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-March/000218.html Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Danielle Adams <[email protected]>
1 parent 7a6a870 commit 3924618

File tree

207 files changed

+410
-455
lines changed

Some content is hidden

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

207 files changed

+410
-455
lines changed

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

Lines changed: 3 additions & 4 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.30.0",
65+
perl_version => "5.28.1",
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.1m+quic",
115-
version_num => "0x101010dfL",
114+
version => "1.1.1n+quic",
115+
version_num => "0x101010efL",
116116
);
117117

118118
our %target = (
@@ -1273,7 +1273,6 @@ our %unified_info = (
12731273
],
12741274
"test/ec_internal_test" =>
12751275
[
1276-
"apps/libapps.a",
12771276
"libcrypto.a",
12781277
"test/libtestutil.a",
12791278
],

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 Dec 14 20:49:47 2021 UTC"
14+
#define DATE "built on: Tue Mar 15 19:21:51 2022 UTC"
1515

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

deps/openssl/config/archs/BSD-x86/asm/include/progs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

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

Lines changed: 6 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 => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
54+
makedepprog => "",
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-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-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",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.30.0",
65+
perl_version => "5.28.1",
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.1m+quic",
115-
version_num => "0x101010dfL",
114+
version => "1.1.1n+quic",
115+
version_num => "0x101010efL",
116116
);
117117

118118
our %target = (
@@ -331,6 +331,7 @@ our %disabled = (
331331
"fuzz-afl" => "default",
332332
"fuzz-libfuzzer" => "default",
333333
"heartbeats" => "default",
334+
"makedepend" => "unavailable",
334335
"md2" => "default",
335336
"msan" => "default",
336337
"rc5" => "default",
@@ -1273,7 +1274,6 @@ our %unified_info = (
12731274
],
12741275
"test/ec_internal_test" =>
12751276
[
1276-
"apps/libapps.a",
12771277
"libcrypto.a",
12781278
"test/libtestutil.a",
12791279
],

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 Dec 14 20:49:52 2021 UTC"
14+
#define DATE "built on: Tue Mar 15 19:21:54 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/include/progs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

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

Lines changed: 3 additions & 4 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.30.0",
64+
perl_version => "5.28.1",
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.1m+quic",
114-
version_num => "0x101010dfL",
113+
version => "1.1.1n+quic",
114+
version_num => "0x101010efL",
115115
);
116116

117117
our %target = (
@@ -1271,7 +1271,6 @@ our %unified_info = (
12711271
],
12721272
"test/ec_internal_test" =>
12731273
[
1274-
"apps/libapps.a",
12751274
"libcrypto.a",
12761275
"test/libtestutil.a",
12771276
],

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 Dec 14 20:49:56 2021 UTC"
14+
#define DATE "built on: Tue Mar 15 19:21:57 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/include/progs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

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

Lines changed: 3 additions & 4 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.30.0",
65+
perl_version => "5.28.1",
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.1m+quic",
115-
version_num => "0x101010dfL",
114+
version => "1.1.1n+quic",
115+
version_num => "0x101010efL",
116116
);
117117

118118
our %target = (
@@ -1282,7 +1282,6 @@ our %unified_info = (
12821282
],
12831283
"test/ec_internal_test" =>
12841284
[
1285-
"apps/libapps.a",
12861285
"libcrypto.a",
12871286
"test/libtestutil.a",
12881287
],

0 commit comments

Comments
 (0)