Skip to content

Commit

Permalink
QUIC: Fix CI (openssl#20)
Browse files Browse the repository at this point in the history
Fixes openssl#2 and openssl#3 and openssl#22 

Updates `Configure` script to disable QUIC with `no-bulk` and `no-ec`
Updates build.info doc docs
Fixes an issue with extension defintions and `no-quic`
  • Loading branch information
tmshort committed Apr 9, 2021
1 parent 6df2ae2 commit af922d2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Configure
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
Original file line number Diff line number Diff line change
Expand Up @@ -2154,6 +2154,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 @@ -3180,6 +3184,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 @@ -3753,6 +3758,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
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,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
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

0 comments on commit af922d2

Please sign in to comment.