Skip to content
This repository was archived by the owner on Apr 10, 2025. It is now read-only.

QUIC: Fix CI #20

Merged
merged 1 commit into from
Mar 18, 2021
Merged

QUIC: Fix CI #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,14 +557,15 @@ my @disable_cascades = (
"sm3", "sm4", "srp",
"srtp", "ssl3-method",
"ts", "ui-console", "whirlpool",
"quic",
"fips-securitychecks" ],
sub { $config{processor} eq "386" }
=> [ "sse2" ],
"ssl" => [ "ssl3" ],
"ssl3-method" => [ "ssl3" ],
"zlib" => [ "zlib-dynamic" ],
"des" => [ "mdc2" ],
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ],
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
"dtls" => [ @dtls ],
Expand Down
6 changes: 6 additions & 0 deletions doc/build.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2150,6 +2150,10 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie
GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod
DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod
Expand Down Expand Up @@ -3171,6 +3175,7 @@ html/man3/SSL_CTX_set_msg_callback.html \
html/man3/SSL_CTX_set_num_tickets.html \
html/man3/SSL_CTX_set_options.html \
html/man3/SSL_CTX_set_psk_client_callback.html \
html/man3/SSL_CTX_set_quic_method.html \
html/man3/SSL_CTX_set_quiet_shutdown.html \
html/man3/SSL_CTX_set_read_ahead.html \
html/man3/SSL_CTX_set_record_padding_callback.html \
Expand Down Expand Up @@ -3742,6 +3747,7 @@ man/man3/SSL_CTX_set_msg_callback.3 \
man/man3/SSL_CTX_set_num_tickets.3 \
man/man3/SSL_CTX_set_options.3 \
man/man3/SSL_CTX_set_psk_client_callback.3 \
man/man3/SSL_CTX_set_quic_method.3 \
man/man3/SSL_CTX_set_quiet_shutdown.3 \
man/man3/SSL_CTX_set_read_ahead.3 \
man/man3/SSL_CTX_set_record_padding_callback.3 \
Expand Down
1 change: 1 addition & 0 deletions ssl/statem/extensions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
},
#else
INVALID_EXTENSION,
INVALID_EXTENSION,
#endif
{
/* Must be immediately before pre_shared_key */
Expand Down
2 changes: 1 addition & 1 deletion ssl/statem/extensions_srvr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,7 +1900,7 @@ EXT_RETURN tls_construct_stoc_early_data(SSL *s, WPACKET *pkt,

#ifndef OPENSSL_NO_QUIC
/* QUIC server must always send 0xFFFFFFFF, per draft-ietf-quic-tls-27 S4.5 */
if (s->quic_method != NULL)
if (SSL_IS_QUIC(s))
max_early_data = 0xFFFFFFFF;
#endif

Expand Down