Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1+quic
Browse files Browse the repository at this point in the history
Signed-off-by: James M Snell <jasnell@gmail.com>

PR-URL: #37601
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
jasnell authored and danielleadams committed Mar 16, 2021
1 parent 6d77b61 commit ce357c0
Show file tree
Hide file tree
Showing 201 changed files with 2,151 additions and 476 deletions.
35 changes: 29 additions & 6 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ our %config = (
openssl_thread_defines => [ "OPENSSL_THREADS" ],
openssldir => "",
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",
perl_archname => "x86_64-linux-thread-multi",
perl_archname => "x86_64-linux-gnu-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.30.3",
perl_version => "5.30.0",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -104,14 +104,14 @@ our %config = (
processor => "",
rc4_int => "unsigned int",
sdirs => [ "objects", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2", "siphash", "sm3", "des", "aes", "rc2", "rc4", "idea", "aria", "bf", "cast", "camellia", "seed", "sm4", "chacha", "modes", "bn", "ec", "rsa", "dsa", "dh", "sm2", "dso", "engine", "buffer", "bio", "stack", "lhash", "rand", "err", "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "ocsp", "ui", "cms", "ts", "srp", "cmac", "ct", "async", "kdf", "store" ],
shlib_major => "1",
shlib_minor => "1",
shlib_major => "81",
shlib_minor => "1.1",
shlib_version_history => "",
shlib_version_number => "1.1",
shlib_version_number => "81.1.1",
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1j",
version => "1.1.1j+quic",
version_num => "0x101010afL",
);

Expand Down Expand Up @@ -268,6 +268,7 @@ our @disablables = (
"poly1305",
"posix-io",
"psk",
"quic",
"rc2",
"rc4",
"rc5",
Expand Down Expand Up @@ -3168,6 +3169,7 @@ our %unified_info = (
"ssl/ssl_init.o",
"ssl/ssl_lib.o",
"ssl/ssl_mcnf.o",
"ssl/ssl_quic.o",
"ssl/ssl_rsa.o",
"ssl/ssl_sess.o",
"ssl/ssl_stat.o",
Expand Down Expand Up @@ -3218,6 +3220,7 @@ our %unified_info = (
"ssl/statem/statem_clnt.o",
"ssl/statem/statem_dtls.o",
"ssl/statem/statem_lib.o",
"ssl/statem/statem_quic.o",
"ssl/statem/statem_srvr.o",
],
"products" =>
Expand Down Expand Up @@ -8533,6 +8536,11 @@ our %unified_info = (
".",
"include",
],
"ssl/ssl_quic.o" =>
[
".",
"include",
],
"ssl/ssl_rsa.o" =>
[
".",
Expand Down Expand Up @@ -8598,6 +8606,11 @@ our %unified_info = (
".",
"include",
],
"ssl/statem/statem_quic.o" =>
[
".",
"include",
],
"ssl/statem/statem_srvr.o" =>
[
".",
Expand Down Expand Up @@ -13377,6 +13390,7 @@ our %unified_info = (
"ssl/ssl_init.o",
"ssl/ssl_lib.o",
"ssl/ssl_mcnf.o",
"ssl/ssl_quic.o",
"ssl/ssl_rsa.o",
"ssl/ssl_sess.o",
"ssl/ssl_stat.o",
Expand All @@ -13390,6 +13404,7 @@ our %unified_info = (
"ssl/statem/statem_clnt.o",
"ssl/statem/statem_dtls.o",
"ssl/statem/statem_lib.o",
"ssl/statem/statem_quic.o",
"ssl/statem/statem_srvr.o",
"ssl/t1_enc.o",
"ssl/t1_lib.o",
Expand Down Expand Up @@ -13497,6 +13512,10 @@ our %unified_info = (
[
"ssl/ssl_mcnf.c",
],
"ssl/ssl_quic.o" =>
[
"ssl/ssl_quic.c",
],
"ssl/ssl_rsa.o" =>
[
"ssl/ssl_rsa.c",
Expand Down Expand Up @@ -13549,6 +13568,10 @@ our %unified_info = (
[
"ssl/statem/statem_lib.c",
],
"ssl/statem/statem_quic.o" =>
[
"ssl/statem/statem_quic.c",
],
"ssl/statem/statem_srvr.o" =>
[
"ssl/statem/statem_srvr.c",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Feb 17 12:02:01 2021 UTC"
#define DATE "built on: Thu Mar 4 14:45:54 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'openssl/ssl/ssl_init.c',
'openssl/ssl/ssl_lib.c',
'openssl/ssl/ssl_mcnf.c',
'openssl/ssl/ssl_quic.c',
'openssl/ssl/ssl_rsa.c',
'openssl/ssl/ssl_sess.c',
'openssl/ssl/ssl_stat.c',
Expand All @@ -39,6 +40,7 @@
'openssl/ssl/statem/statem_clnt.c',
'openssl/ssl/statem/statem_dtls.c',
'openssl/ssl/statem/statem_lib.c',
'openssl/ssl/statem/statem_quic.c',
'openssl/ssl/statem/statem_srvr.c',
'openssl/ssl/t1_enc.c',
'openssl/ssl/t1_lib.c',
Expand Down
35 changes: 29 additions & 6 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ our %config = (
openssl_thread_defines => [ "OPENSSL_THREADS" ],
openssldir => "",
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",
perl_archname => "x86_64-linux-thread-multi",
perl_archname => "x86_64-linux-gnu-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.30.3",
perl_version => "5.30.0",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -104,14 +104,14 @@ our %config = (
processor => "",
rc4_int => "unsigned int",
sdirs => [ "objects", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2", "siphash", "sm3", "des", "aes", "rc2", "rc4", "idea", "aria", "bf", "cast", "camellia", "seed", "sm4", "chacha", "modes", "bn", "ec", "rsa", "dsa", "dh", "sm2", "dso", "engine", "buffer", "bio", "stack", "lhash", "rand", "err", "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "ocsp", "ui", "cms", "ts", "srp", "cmac", "ct", "async", "kdf", "store" ],
shlib_major => "1",
shlib_minor => "1",
shlib_major => "81",
shlib_minor => "1.1",
shlib_version_history => "",
shlib_version_number => "1.1",
shlib_version_number => "81.1.1",
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1j",
version => "1.1.1j+quic",
version_num => "0x101010afL",
);

Expand Down Expand Up @@ -268,6 +268,7 @@ our @disablables = (
"poly1305",
"posix-io",
"psk",
"quic",
"rc2",
"rc4",
"rc5",
Expand Down Expand Up @@ -3168,6 +3169,7 @@ our %unified_info = (
"ssl/ssl_init.o",
"ssl/ssl_lib.o",
"ssl/ssl_mcnf.o",
"ssl/ssl_quic.o",
"ssl/ssl_rsa.o",
"ssl/ssl_sess.o",
"ssl/ssl_stat.o",
Expand Down Expand Up @@ -3218,6 +3220,7 @@ our %unified_info = (
"ssl/statem/statem_clnt.o",
"ssl/statem/statem_dtls.o",
"ssl/statem/statem_lib.o",
"ssl/statem/statem_quic.o",
"ssl/statem/statem_srvr.o",
],
"products" =>
Expand Down Expand Up @@ -8533,6 +8536,11 @@ our %unified_info = (
".",
"include",
],
"ssl/ssl_quic.o" =>
[
".",
"include",
],
"ssl/ssl_rsa.o" =>
[
".",
Expand Down Expand Up @@ -8598,6 +8606,11 @@ our %unified_info = (
".",
"include",
],
"ssl/statem/statem_quic.o" =>
[
".",
"include",
],
"ssl/statem/statem_srvr.o" =>
[
".",
Expand Down Expand Up @@ -13377,6 +13390,7 @@ our %unified_info = (
"ssl/ssl_init.o",
"ssl/ssl_lib.o",
"ssl/ssl_mcnf.o",
"ssl/ssl_quic.o",
"ssl/ssl_rsa.o",
"ssl/ssl_sess.o",
"ssl/ssl_stat.o",
Expand All @@ -13390,6 +13404,7 @@ our %unified_info = (
"ssl/statem/statem_clnt.o",
"ssl/statem/statem_dtls.o",
"ssl/statem/statem_lib.o",
"ssl/statem/statem_quic.o",
"ssl/statem/statem_srvr.o",
"ssl/t1_enc.o",
"ssl/t1_lib.o",
Expand Down Expand Up @@ -13497,6 +13512,10 @@ our %unified_info = (
[
"ssl/ssl_mcnf.c",
],
"ssl/ssl_quic.o" =>
[
"ssl/ssl_quic.c",
],
"ssl/ssl_rsa.o" =>
[
"ssl/ssl_rsa.c",
Expand Down Expand Up @@ -13549,6 +13568,10 @@ our %unified_info = (
[
"ssl/statem/statem_lib.c",
],
"ssl/statem/statem_quic.o" =>
[
"ssl/statem/statem_quic.c",
],
"ssl/statem/statem_srvr.o" =>
[
"ssl/statem/statem_srvr.c",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Feb 17 12:02:04 2021 UTC"
#define DATE "built on: Thu Mar 4 14:45:56 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'openssl/ssl/ssl_init.c',
'openssl/ssl/ssl_lib.c',
'openssl/ssl/ssl_mcnf.c',
'openssl/ssl/ssl_quic.c',
'openssl/ssl/ssl_rsa.c',
'openssl/ssl/ssl_sess.c',
'openssl/ssl/ssl_stat.c',
Expand All @@ -39,6 +40,7 @@
'openssl/ssl/statem/statem_clnt.c',
'openssl/ssl/statem/statem_dtls.c',
'openssl/ssl/statem/statem_lib.c',
'openssl/ssl/statem/statem_quic.c',
'openssl/ssl/statem/statem_srvr.c',
'openssl/ssl/t1_enc.c',
'openssl/ssl/t1_lib.c',
Expand Down
Loading

0 comments on commit ce357c0

Please sign in to comment.