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

Commit d72f294

Browse files
committed
QUIC: Fix CI (#20)
Fixes #2 and #3 and #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 c0b9c0d commit d72f294

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
@@ -578,14 +578,15 @@ my @disable_cascades = (
578578
"sm3", "sm4", "srp",
579579
"srtp", "ssl3-method", "ssl-trace",
580580
"ts", "ui-console", "whirlpool",
581+
"quic",
581582
"fips-securitychecks" ],
582583
sub { $config{processor} eq "386" }
583584
=> [ "sse2" ],
584585
"ssl" => [ "ssl3" ],
585586
"ssl3-method" => [ "ssl3" ],
586587
"zlib" => [ "zlib-dynamic" ],
587588
"des" => [ "mdc2" ],
588-
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
589+
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ],
589590
"dgram" => [ "dtls", "sctp" ],
590591
"sock" => [ "dgram" ],
591592
"dtls" => [ @dtls ],

doc/build.info

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,6 +2235,10 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie
22352235
GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod
22362236
DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
22372237
GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
2238+
DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2239+
GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2240+
DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
2241+
GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
22382242
DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22392243
GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22402244
DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod
@@ -3294,6 +3298,7 @@ html/man3/SSL_CTX_set_msg_callback.html \
32943298
html/man3/SSL_CTX_set_num_tickets.html \
32953299
html/man3/SSL_CTX_set_options.html \
32963300
html/man3/SSL_CTX_set_psk_client_callback.html \
3301+
html/man3/SSL_CTX_set_quic_method.html \
32973302
html/man3/SSL_CTX_set_quiet_shutdown.html \
32983303
html/man3/SSL_CTX_set_read_ahead.html \
32993304
html/man3/SSL_CTX_set_record_padding_callback.html \
@@ -3890,6 +3895,7 @@ man/man3/SSL_CTX_set_msg_callback.3 \
38903895
man/man3/SSL_CTX_set_num_tickets.3 \
38913896
man/man3/SSL_CTX_set_options.3 \
38923897
man/man3/SSL_CTX_set_psk_client_callback.3 \
3898+
man/man3/SSL_CTX_set_quic_method.3 \
38933899
man/man3/SSL_CTX_set_quiet_shutdown.3 \
38943900
man/man3/SSL_CTX_set_read_ahead.3 \
38953901
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
@@ -396,6 +396,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
396396
},
397397
#else
398398
INVALID_EXTENSION,
399+
INVALID_EXTENSION,
399400
#endif
400401
{
401402
/* 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
@@ -1905,7 +1905,7 @@ EXT_RETURN tls_construct_stoc_early_data(SSL *s, WPACKET *pkt,
19051905

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

0 commit comments

Comments
 (0)