Skip to content

Commit 781cb6d

Browse files
tniessenMylesBorins
tniessen
authored and
MylesBorins
committed
deps: update archs files for OpenSSL-1.1.1k
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: #37940 Refs: #37913 Refs: #37916 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
1 parent 5db0a05 commit 781cb6d

File tree

119 files changed

+300
-297
lines changed

Some content is hidden

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

119 files changed

+300
-297
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ our %config = (
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
6262
options => " 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-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
63-
perl_archname => "x86_64-linux-thread-multi",
63+
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.30.3",
65+
perl_version => "5.26.1",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "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.1j",
115-
version_num => "0x101010afL",
114+
version => "1.1.1k",
115+
version_num => "0x101010bfL",
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: Wed Feb 17 13:54:49 2021 UTC"
14+
#define DATE "built on: Sat Mar 27 00:55:47 2021 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ our %config = (
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
6262
options => " 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-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
63-
perl_archname => "x86_64-linux-thread-multi",
63+
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.30.3",
65+
perl_version => "5.26.1",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "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.1j",
115-
version_num => "0x101010afL",
114+
version => "1.1.1k",
115+
version_num => "0x101010bfL",
116116
);
117117

118118
our %target = (

‎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: Wed Feb 17 13:54:56 2021 UTC"
14+
#define DATE "built on: Sat Mar 27 00:55:53 2021 UTC"
1515

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ our %config = (
5959
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6060
openssldir => "",
6161
options => " 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-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
62-
perl_archname => "x86_64-linux-thread-multi",
62+
perl_archname => "x86_64-linux-gnu-thread-multi",
6363
perl_cmd => "/usr/bin/perl",
64-
perl_version => "5.30.3",
64+
perl_version => "5.26.1",
6565
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "no-asm", "BSD-x86_64" ],
6666
perlenv => {
6767
"AR" => undef,
@@ -110,8 +110,8 @@ our %config = (
110110
sourcedir => ".",
111111
target => "BSD-x86_64",
112112
tdirs => [ "ossl_shim" ],
113-
version => "1.1.1j",
114-
version_num => "0x101010afL",
113+
version => "1.1.1k",
114+
version_num => "0x101010bfL",
115115
);
116116

117117
our %target = (

‎deps/openssl/config/archs/BSD-x86_64/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_64"
14-
#define DATE "built on: Wed Feb 17 13:55:02 2021 UTC"
14+
#define DATE "built on: Sat Mar 27 00:55:58 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN32/asm/configdata.pm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ our %config = (
6464
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6565
openssldir => "",
6666
options => " no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng 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-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
67-
perl_archname => "x86_64-linux-thread-multi",
67+
perl_archname => "x86_64-linux-gnu-thread-multi",
6868
perl_cmd => "/usr/bin/perl",
69-
perl_version => "5.30.3",
69+
perl_version => "5.26.1",
7070
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "VC-WIN32" ],
7171
perlenv => {
7272
"AR" => undef,
@@ -115,8 +115,8 @@ our %config = (
115115
sourcedir => ".",
116116
target => "VC-WIN32",
117117
tdirs => [ "ossl_shim" ],
118-
version => "1.1.1j",
119-
version_num => "0x101010afL",
118+
version => "1.1.1k",
119+
version_num => "0x101010bfL",
120120
);
121121

122122
our %target = (
@@ -132,7 +132,7 @@ our %target = (
132132
LDFLAGS => "/nologo /debug",
133133
MT => "mt",
134134
MTFLAGS => "-nologo",
135-
RANLIB => "CODE(0x56078271fdc8)",
135+
RANLIB => "CODE(0x558190362058)",
136136
RC => "rc",
137137
_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" ],
138138
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",

‎deps/openssl/config/archs/VC-WIN32/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: "
14-
#define DATE "built on: Wed Feb 17 13:57:49 2021 UTC"
14+
#define DATE "built on: Sat Mar 27 00:58:02 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ our %config = (
6464
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6565
openssldir => "",
6666
options => " no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng 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-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
67-
perl_archname => "x86_64-linux-thread-multi",
67+
perl_archname => "x86_64-linux-gnu-thread-multi",
6868
perl_cmd => "/usr/bin/perl",
69-
perl_version => "5.30.3",
69+
perl_version => "5.26.1",
7070
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "VC-WIN32" ],
7171
perlenv => {
7272
"AR" => undef,
@@ -115,8 +115,8 @@ our %config = (
115115
sourcedir => ".",
116116
target => "VC-WIN32",
117117
tdirs => [ "ossl_shim" ],
118-
version => "1.1.1j",
119-
version_num => "0x101010afL",
118+
version => "1.1.1k",
119+
version_num => "0x101010bfL",
120120
);
121121

122122
our %target = (
@@ -132,7 +132,7 @@ our %target = (
132132
LDFLAGS => "/nologo /debug",
133133
MT => "mt",
134134
MTFLAGS => "-nologo",
135-
RANLIB => "CODE(0x55b8e2a36798)",
135+
RANLIB => "CODE(0x5570b9683158)",
136136
RC => "rc",
137137
_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" ],
138138
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",

‎deps/openssl/config/archs/VC-WIN32/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: "
14-
#define DATE "built on: Wed Feb 17 13:57:54 2021 UTC"
14+
#define DATE "built on: Sat Mar 27 00:58:04 2021 UTC"
1515

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

0 commit comments

Comments
 (0)