Skip to content

Commit 3577189

Browse files
tmshortLycs-D
authored andcommitted
QUIC: Fix CI (quictls#20)
Fixes quictls#2 and quictls#3 and quictls#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`
1 parent c08f205 commit 3577189

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

Configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,14 +579,15 @@ my @disable_cascades = (
579579
"sm3", "sm4", "srp",
580580
"srtp", "ssl3-method", "ssl-trace",
581581
"ts", "ui-console", "whirlpool",
582+
"quic",
582583
"fips-securitychecks" ],
583584
sub { $config{processor} eq "386" }
584585
=> [ "sse2" ],
585586
"ssl" => [ "ssl3" ],
586587
"ssl3-method" => [ "ssl3" ],
587588
"zlib" => [ "zlib-dynamic" ],
588589
"des" => [ "mdc2" ],
589-
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
590+
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ],
590591
"dgram" => [ "dtls", "sctp" ],
591592
"sock" => [ "dgram" ],
592593
"dtls" => [ @dtls ],

doc/build.info

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,6 +2271,10 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie
22712271
GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod
22722272
DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
22732273
GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
2274+
DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2275+
GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2276+
DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
2277+
GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
22742278
DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22752279
GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22762280
DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod
@@ -3351,6 +3355,7 @@ html/man3/SSL_CTX_set_msg_callback.html \
33513355
html/man3/SSL_CTX_set_num_tickets.html \
33523356
html/man3/SSL_CTX_set_options.html \
33533357
html/man3/SSL_CTX_set_psk_client_callback.html \
3358+
html/man3/SSL_CTX_set_quic_method.html \
33543359
html/man3/SSL_CTX_set_quiet_shutdown.html \
33553360
html/man3/SSL_CTX_set_read_ahead.html \
33563361
html/man3/SSL_CTX_set_record_padding_callback.html \
@@ -3959,6 +3964,7 @@ man/man3/SSL_CTX_set_msg_callback.3 \
39593964
man/man3/SSL_CTX_set_num_tickets.3 \
39603965
man/man3/SSL_CTX_set_options.3 \
39613966
man/man3/SSL_CTX_set_psk_client_callback.3 \
3967+
man/man3/SSL_CTX_set_quic_method.3 \
39623968
man/man3/SSL_CTX_set_quiet_shutdown.3 \
39633969
man/man3/SSL_CTX_set_read_ahead.3 \
39643970
man/man3/SSL_CTX_set_record_padding_callback.3 \

ssl/statem/extensions.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
395395
},
396396
#else
397397
INVALID_EXTENSION,
398+
INVALID_EXTENSION,
398399
#endif
399400
{
400401
/* Must be immediately before pre_shared_key */

ssl/statem/extensions_srvr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1912,7 +1912,7 @@ EXT_RETURN tls_construct_stoc_early_data(SSL *s, WPACKET *pkt,
19121912

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

0 commit comments

Comments
 (0)