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

Commit af922d2

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 6df2ae2 commit af922d2

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
@@ -557,14 +557,15 @@ my @disable_cascades = (
557557
"sm3", "sm4", "srp",
558558
"srtp", "ssl3-method",
559559
"ts", "ui-console", "whirlpool",
560+
"quic",
560561
"fips-securitychecks" ],
561562
sub { $config{processor} eq "386" }
562563
=> [ "sse2" ],
563564
"ssl" => [ "ssl3" ],
564565
"ssl3-method" => [ "ssl3" ],
565566
"zlib" => [ "zlib-dynamic" ],
566567
"des" => [ "mdc2" ],
567-
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
568+
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ],
568569
"dgram" => [ "dtls", "sctp" ],
569570
"sock" => [ "dgram" ],
570571
"dtls" => [ @dtls ],

doc/build.info

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2154,6 +2154,10 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie
21542154
GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod
21552155
DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
21562156
GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
2157+
DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2158+
GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2159+
DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
2160+
GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
21572161
DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
21582162
GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
21592163
DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod
@@ -3180,6 +3184,7 @@ html/man3/SSL_CTX_set_msg_callback.html \
31803184
html/man3/SSL_CTX_set_num_tickets.html \
31813185
html/man3/SSL_CTX_set_options.html \
31823186
html/man3/SSL_CTX_set_psk_client_callback.html \
3187+
html/man3/SSL_CTX_set_quic_method.html \
31833188
html/man3/SSL_CTX_set_quiet_shutdown.html \
31843189
html/man3/SSL_CTX_set_read_ahead.html \
31853190
html/man3/SSL_CTX_set_record_padding_callback.html \
@@ -3753,6 +3758,7 @@ man/man3/SSL_CTX_set_msg_callback.3 \
37533758
man/man3/SSL_CTX_set_num_tickets.3 \
37543759
man/man3/SSL_CTX_set_options.3 \
37553760
man/man3/SSL_CTX_set_psk_client_callback.3 \
3761+
man/man3/SSL_CTX_set_quic_method.3 \
37563762
man/man3/SSL_CTX_set_quiet_shutdown.3 \
37573763
man/man3/SSL_CTX_set_read_ahead.3 \
37583764
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
@@ -393,6 +393,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
393393
},
394394
#else
395395
INVALID_EXTENSION,
396+
INVALID_EXTENSION,
396397
#endif
397398
{
398399
/* 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
@@ -1900,7 +1900,7 @@ EXT_RETURN tls_construct_stoc_early_data(SSL *s, WPACKET *pkt,
19001900

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

0 commit comments

Comments
 (0)