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

Commit 6831e0a

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 e8e0176 commit 6831e0a

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
@@ -576,14 +576,15 @@ my @disable_cascades = (
576576
"sm3", "sm4", "srp",
577577
"srtp", "ssl3-method", "ssl-trace",
578578
"ts", "ui-console", "whirlpool",
579+
"quic",
579580
"fips-securitychecks" ],
580581
sub { $config{processor} eq "386" }
581582
=> [ "sse2" ],
582583
"ssl" => [ "ssl3" ],
583584
"ssl3-method" => [ "ssl3" ],
584585
"zlib" => [ "zlib-dynamic" ],
585586
"des" => [ "mdc2" ],
586-
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
587+
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ],
587588
"dgram" => [ "dtls", "sctp" ],
588589
"sock" => [ "dgram" ],
589590
"dtls" => [ @dtls ],

doc/build.info

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2227,6 +2227,10 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie
22272227
GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod
22282228
DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
22292229
GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
2230+
DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2231+
GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2232+
DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
2233+
GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
22302234
DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22312235
GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22322236
DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod
@@ -3276,6 +3280,7 @@ html/man3/SSL_CTX_set_msg_callback.html \
32763280
html/man3/SSL_CTX_set_num_tickets.html \
32773281
html/man3/SSL_CTX_set_options.html \
32783282
html/man3/SSL_CTX_set_psk_client_callback.html \
3283+
html/man3/SSL_CTX_set_quic_method.html \
32793284
html/man3/SSL_CTX_set_quiet_shutdown.html \
32803285
html/man3/SSL_CTX_set_read_ahead.html \
32813286
html/man3/SSL_CTX_set_record_padding_callback.html \
@@ -3868,6 +3873,7 @@ man/man3/SSL_CTX_set_msg_callback.3 \
38683873
man/man3/SSL_CTX_set_num_tickets.3 \
38693874
man/man3/SSL_CTX_set_options.3 \
38703875
man/man3/SSL_CTX_set_psk_client_callback.3 \
3876+
man/man3/SSL_CTX_set_quic_method.3 \
38713877
man/man3/SSL_CTX_set_quiet_shutdown.3 \
38723878
man/man3/SSL_CTX_set_read_ahead.3 \
38733879
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
@@ -1902,7 +1902,7 @@ EXT_RETURN tls_construct_stoc_early_data(SSL *s, WPACKET *pkt,
19021902

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

0 commit comments

Comments
 (0)