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

Commit 02e9ec8

Browse files
tmshortwbl
authored andcommitted
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 454be29 commit 02e9ec8

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
@@ -2263,6 +2263,10 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie
22632263
GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod
22642264
DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
22652265
GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
2266+
DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2267+
GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
2268+
DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
2269+
GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
22662270
DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22672271
GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
22682272
DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod
@@ -3329,6 +3333,7 @@ html/man3/SSL_CTX_set_msg_callback.html \
33293333
html/man3/SSL_CTX_set_num_tickets.html \
33303334
html/man3/SSL_CTX_set_options.html \
33313335
html/man3/SSL_CTX_set_psk_client_callback.html \
3336+
html/man3/SSL_CTX_set_quic_method.html \
33323337
html/man3/SSL_CTX_set_quiet_shutdown.html \
33333338
html/man3/SSL_CTX_set_read_ahead.html \
33343339
html/man3/SSL_CTX_set_record_padding_callback.html \
@@ -3932,6 +3937,7 @@ man/man3/SSL_CTX_set_msg_callback.3 \
39323937
man/man3/SSL_CTX_set_num_tickets.3 \
39333938
man/man3/SSL_CTX_set_options.3 \
39343939
man/man3/SSL_CTX_set_psk_client_callback.3 \
3940+
man/man3/SSL_CTX_set_quic_method.3 \
39353941
man/man3/SSL_CTX_set_quiet_shutdown.3 \
39363942
man/man3/SSL_CTX_set_read_ahead.3 \
39373943
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
@@ -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)