From 77248f1c1c8ea8dc57d624050b78eab0b3a10a04 Mon Sep 17 00:00:00 2001
From: Todd Short <tmshort@users.noreply.github.com>
Date: Thu, 18 Mar 2021 12:42:01 -0400
Subject: [PATCH] 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`
---
Configure | 3 ++-
doc/build.info | 6 ++++++
ssl/statem/extensions.c | 1 +
ssl/statem/extensions_srvr.c | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Configure b/Configure
index fb35880c2ef6f..c97b42a2216cc 100755
--- a/Configure
+++ b/Configure
@@ -557,6 +557,7 @@ my @disable_cascades = (
"sm3", "sm4", "srp",
"srtp", "ssl3-method",
"ts", "ui-console", "whirlpool",
+ "quic",
"fips-securitychecks" ],
sub { $config{processor} eq "386" }
=> [ "sse2" ],
@@ -564,7 +565,7 @@ my @disable_cascades = (
"ssl3-method" => [ "ssl3" ],
"zlib" => [ "zlib-dynamic" ],
"des" => [ "mdc2" ],
- "ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
+ "ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ],
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
"dtls" => [ @dtls ],
diff --git a/doc/build.info b/doc/build.info
index d9c5d8d4fca05..c18af834c5a22 100644
--- a/doc/build.info
+++ b/doc/build.info
@@ -2162,6 +2162,10 @@ DEPEND[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_clie
GENERATE[html/man3/SSL_CTX_set_psk_client_callback.html]=man3/SSL_CTX_set_psk_client_callback.pod
DEPEND[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
GENERATE[man/man3/SSL_CTX_set_psk_client_callback.3]=man3/SSL_CTX_set_psk_client_callback.pod
+DEPEND[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
+GENERATE[html/man3/SSL_CTX_set_quic_method.html]=man3/SSL_CTX_set_quic_method.pod
+DEPEND[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
+GENERATE[man/man3/SSL_CTX_set_quic_method.3]=man3/SSL_CTX_set_quic_method.pod
DEPEND[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
GENERATE[html/man3/SSL_CTX_set_quiet_shutdown.html]=man3/SSL_CTX_set_quiet_shutdown.pod
DEPEND[man/man3/SSL_CTX_set_quiet_shutdown.3]=man3/SSL_CTX_set_quiet_shutdown.pod
@@ -3190,6 +3194,7 @@ html/man3/SSL_CTX_set_msg_callback.html \
html/man3/SSL_CTX_set_num_tickets.html \
html/man3/SSL_CTX_set_options.html \
html/man3/SSL_CTX_set_psk_client_callback.html \
+html/man3/SSL_CTX_set_quic_method.html \
html/man3/SSL_CTX_set_quiet_shutdown.html \
html/man3/SSL_CTX_set_read_ahead.html \
html/man3/SSL_CTX_set_record_padding_callback.html \
@@ -3765,6 +3770,7 @@ man/man3/SSL_CTX_set_msg_callback.3 \
man/man3/SSL_CTX_set_num_tickets.3 \
man/man3/SSL_CTX_set_options.3 \
man/man3/SSL_CTX_set_psk_client_callback.3 \
+man/man3/SSL_CTX_set_quic_method.3 \
man/man3/SSL_CTX_set_quiet_shutdown.3 \
man/man3/SSL_CTX_set_read_ahead.3 \
man/man3/SSL_CTX_set_record_padding_callback.3 \
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 708b7fc9488db..b52ba23e88ea9 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -393,6 +393,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
},
#else
INVALID_EXTENSION,
+ INVALID_EXTENSION,
#endif
{
/* Must be immediately before pre_shared_key */
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index f5fb3642f74b4..b92e273a6abad 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -1900,7 +1900,7 @@ EXT_RETURN tls_construct_stoc_early_data(SSL *s, WPACKET *pkt,
#ifndef OPENSSL_NO_QUIC
/* QUIC server must always send 0xFFFFFFFF, per draft-ietf-quic-tls-27 S4.5 */
- if (s->quic_method != NULL)
+ if (SSL_IS_QUIC(s))
max_early_data = 0xFFFFFFFF;
#endif