Skip to content

Commit 74cbfd3

Browse files
kadukjasnell
kaduk
authored and
jasnell
committed
deps: cherry-pick akamai/openssl/commit/a6282c566d88db11300c82abc3c84a4e2e9ea568
Original Commit Message: Some cleanup for the main QUIC changes Try to reduce unneeded whitespace changes and wrap new code to 80 columns. Reword documentation to attempt to improve clarity. Add some more sanity checks and clarifying comments to the code. Update referenced I-D versions. PR-URL: nodejs#34033 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
1 parent 8a9763a commit 74cbfd3

File tree

18 files changed

+166
-111
lines changed

18 files changed

+166
-111
lines changed

‎deps/openssl/openssl/doc/man3/SSL_CTX_set_quic_method.pod‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,25 @@ SSL_quic_max_handshake_flight_len() returns the maximum number of bytes
6363
that may be received at the given encryption level. This function should be
6464
used to limit buffering in the QUIC implementation.
6565

66-
See https://tools.ietf.org/html/draft-ietf-quic-transport-16#section-4.4.
66+
See https://tools.ietf.org/html/draft-ietf-quic-transport-27#section-4.
6767

6868
SSL_quic_read_level() returns the current read encryption level.
6969

7070
SSL_quic_write_level() returns the current write encryption level.
7171

72-
SSL_provide_quic_data() provides data from QUIC at a particular encryption
73-
level B<level>. It is an error to call this function outside of the handshake
74-
or with an encryption level other than the current read level. It returns one
75-
on success and zero on error.
72+
SSL_provide_quic_data() is used to provide data from QUIC CRYPTO frames to the
73+
state machine, at a particular encryption level B<level>. It is an error to
74+
call this function outside of the handshake or with an encryption level other
75+
than the current read level. The application must buffer and consolidate any
76+
frames with less than four bytes of content. It returns one on success and
77+
zero on error.
7678

7779
SSL_process_quic_post_handshake() processes any data that QUIC has provided
7880
after the handshake has completed. This includes NewSessionTicket messages
7981
sent by the server.
8082

81-
SSL_is_quic() indicates whether a connection uses QUIC.
83+
SSL_is_quic() indicates whether a connection uses QUIC. A given B<SSL>
84+
or B<SSL_CTX> can only be used with QUIC or TLS, but not both.
8285

8386
=head1 NOTES
8487

@@ -89,11 +92,11 @@ functions allow a QUIC implementation to serve as the underlying transport as
8992
described in draft-ietf-quic-tls.
9093

9194
When configured for QUIC, SSL_do_handshake() will drive the handshake as
92-
before, but it will not use the configured B<BIO>. It will call functions on
93-
B<SSL_QUIC_METHOD> to configure secrets and send data. If data is needed from
94-
the peer, it will return B<SSL_ERROR_WANT_READ>. When received, the caller
95-
should call SSL_provide_quic_data() and then SSL_do_handshake() to continue
96-
the handshake. After the handshake is complete, the caller should call
95+
before, but it will not use the configured B<BIO>. It will call functions from
96+
the configured B<SSL_QUIC_METHOD> to configure secrets and send data. If data
97+
is needed from the peer, it will return B<SSL_ERROR_WANT_READ>. When received,
98+
the caller should call SSL_provide_quic_data() and then SSL_do_handshake() to
99+
continue the handshake. After the handshake is complete, the caller should call
97100
SSL_provide_quic_data() for any post-handshake data, followed by
98101
SSL_process_quic_post_handshake() to process it. It is an error to call
99102
SSL_read()/SSL_read_ex() and SSL_write()/SSL_write_ex() in QUIC.
@@ -105,19 +108,20 @@ pass the active write level to add_handshake_data() when writing data. Callers
105108
can use SSL_quic_write_level() to query the active write level when
106109
generating their own errors.
107110

108-
See https://tools.ietf.org/html/draft-ietf-quic-tls-15#section-4.1 for more
111+
See https://tools.ietf.org/html/draft-ietf-quic-tls-27#section-4.1 for more
109112
details.
110113

111114
To avoid DoS attacks, the QUIC implementation must limit the amount of data
112115
being queued up. The implementation can call
113116
SSL_quic_max_handshake_flight_len() to get the maximum buffer length at each
114117
encryption level.
115118

116-
draft-ietf-quic-tls defines a new TLS extension quic_transport_parameters
119+
draft-ietf-quic-tls defines a new TLS extension "quic_transport_parameters"
117120
used by QUIC for each endpoint to unilaterally declare its supported
118-
transport parameters. draft-ietf-quic-transport (section 7.4) defines the
119-
contents of that extension (a TransportParameters struct) and describes how
120-
to handle it and its semantic meaning.
121+
transport parameters. The contents of the extension are specified in
122+
https://tools.ietf.org/html/draft-ietf-quic-transport-27#section-18 (as
123+
a sequence of tag/length/value parameters) along with the interpretation of the
124+
various parameters and the rules for their processing.
121125

122126
OpenSSL handles this extension as an opaque byte string. The caller is
123127
responsible for serializing and parsing it.
@@ -205,10 +209,11 @@ SSL_process_quic_post_handshake()
205209
return 1 on success, and 0 on error.
206210

207211
SSL_quic_read_level() and SSL_quic_write_level() return the current
208-
encryption level as B<OSSL_ENCRYPTION_LEVEL> (B<enum ssl_encryption_level_t>).
212+
encryption level as an B<OSSL_ENCRYPTION_LEVEL>
213+
(B<enum ssl_encryption_level_t>).
209214

210-
SSL_quic_max_handshake_flight_len() returns the maximum length of a flight
211-
for a given encryption level.
215+
SSL_quic_max_handshake_flight_len() returns the maximum length in bytes of a
216+
flight for a given encryption level.
212217

213218
SSL_is_quic() returns 1 if QUIC is being used, 0 if not.
214219

‎deps/openssl/openssl/include/openssl/ssl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2473,10 +2473,10 @@ __owur int SSL_process_quic_post_handshake(SSL *ssl);
24732473

24742474
__owur int SSL_is_quic(SSL *ssl);
24752475

2476-
# endif
2477-
24782476
int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c);
24792477

2478+
# endif
2479+
24802480
# ifdef __cplusplus
24812481
}
24822482
# endif

‎deps/openssl/openssl/include/openssl/sslerr.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
#ifndef HEADER_SSLERR_H
1212
# define HEADER_SSLERR_H
1313

14-
# include <openssl/symhacks.h>
14+
# ifndef HEADER_SYMHACKS_H
15+
# include <openssl/symhacks.h>
16+
# endif
1517

1618
# ifdef __cplusplus
1719
extern "C"

‎deps/openssl/openssl/include/openssl/tls1.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ extern "C" {
148148
/* Temporary extension type */
149149
# define TLSEXT_TYPE_renegotiate 0xff01
150150

151-
/* ExtensionType value from draft-ietf-quic-tls-13 */
151+
/* ExtensionType value from draft-ietf-quic-tls-27 */
152152
# define TLSEXT_TYPE_quic_transport_parameters 0xffa5
153153

154154
# ifndef OPENSSL_NO_NEXTPROTONEG

‎deps/openssl/openssl/ssl/build.info‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@ SOURCE[../libssl]=\
1212
ssl_asn1.c ssl_txt.c ssl_init.c ssl_conf.c ssl_mcnf.c \
1313
bio_ssl.c ssl_err.c tls_srp.c t1_trce.c ssl_utst.c \
1414
record/ssl3_buffer.c record/ssl3_record.c record/dtls1_bitmap.c \
15-
statem/statem.c record/ssl3_record_tls13.c \
16-
ssl_quic.c statem/statem_quic.c
15+
statem/statem.c record/ssl3_record_tls13.c
16+
17+
IF[{- !$disabled{quic} -}]
18+
SOURCE[../libssl]=ssl_quic.c statem/statem_quic.c
19+
ENDIF

‎deps/openssl/openssl/ssl/ssl_ciph.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,6 +2163,7 @@ int ssl_cert_is_disabled(size_t idx)
21632163
return 0;
21642164
}
21652165

2166+
#ifndef OPENSSL_NO_QUIC
21662167
int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c)
21672168
{
21682169
switch (c->algorithm2 & (0xFF << TLS1_PRF_DGST_SHIFT)) {
@@ -2194,3 +2195,4 @@ int SSL_CIPHER_get_prf_nid(const SSL_CIPHER *c)
21942195
}
21952196
return NID_undef;
21962197
}
2198+
#endif

‎deps/openssl/openssl/ssl/ssl_lib.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3982,7 +3982,7 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx)
39823982

39833983
const SSL_CIPHER *SSL_get_current_cipher(const SSL *s)
39843984
{
3985-
if (s->session != NULL)
3985+
if ((s->session != NULL) && (s->session->cipher != NULL))
39863986
return s->session->cipher;
39873987
return NULL;
39883988
}

‎deps/openssl/openssl/ssl/ssl_local.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,6 +1086,7 @@ struct quic_data_st {
10861086
OSSL_ENCRYPTION_LEVEL level;
10871087
size_t offset;
10881088
size_t length;
1089+
/* char data[]; should be here but C90 VLAs not allowed here */
10891090
};
10901091
typedef struct quic_data_st QUIC_DATA;
10911092
int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level);
@@ -1561,8 +1562,6 @@ typedef struct tls_group_info_st {
15611562
# define TLS_CURVE_CHAR2 0x1
15621563
# define TLS_CURVE_CUSTOM 0x2
15631564

1564-
typedef struct cert_pkey_st CERT_PKEY;
1565-
15661565
/*
15671566
* Structure containing table entry of certificate info corresponding to
15681567
* CERT_PKEY entries

‎deps/openssl/openssl/ssl/ssl_quic.c‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
#include "internal/cryptlib.h"
1212
#include "internal/refcount.h"
1313

14-
#ifdef OPENSSL_NO_QUIC
15-
NON_EMPTY_TRANSLATION_UNIT
16-
#else
17-
1814
int SSL_set_quic_transport_params(SSL *ssl, const uint8_t *params,
1915
size_t params_len)
2016
{
@@ -109,10 +105,10 @@ int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level,
109105
return 0;
110106
}
111107

112-
/* Split the QUIC messages up, if necessary */
108+
/* Split on handshake message boundaries, if necessary */
113109
while (len > 0) {
114110
QUIC_DATA *qd;
115-
const uint8_t *p = data + 1;
111+
const uint8_t *p;
116112

117113
/* Check for an incomplete block */
118114
qd = ssl->quic_input_data_tail;
@@ -130,6 +126,12 @@ int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level,
130126
}
131127
}
132128

129+
if (len < SSL3_HM_HEADER_LENGTH) {
130+
SSLerr(SSL_F_SSL_PROVIDE_QUIC_DATA, SSL_R_BAD_LENGTH);
131+
return 0;
132+
}
133+
/* TLS Handshake message header has 1-byte type and 3-byte length */
134+
p = data + 1;
133135
n2l3(p, l);
134136
l += SSL3_HM_HEADER_LENGTH;
135137

@@ -163,31 +165,17 @@ int SSL_provide_quic_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL level,
163165

164166
int SSL_CTX_set_quic_method(SSL_CTX *ctx, const SSL_QUIC_METHOD *quic_method)
165167
{
166-
switch (ctx->method->version) {
167-
case DTLS1_VERSION:
168-
case DTLS1_2_VERSION:
169-
case DTLS_ANY_VERSION:
170-
case DTLS1_BAD_VER:
168+
if (ctx->method->version != TLS_ANY_VERSION)
171169
return 0;
172-
default:
173-
break;
174-
}
175170
ctx->quic_method = quic_method;
176171
ctx->options &= ~SSL_OP_ENABLE_MIDDLEBOX_COMPAT;
177172
return 1;
178173
}
179174

180175
int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method)
181176
{
182-
switch (ssl->method->version) {
183-
case DTLS1_VERSION:
184-
case DTLS1_2_VERSION:
185-
case DTLS_ANY_VERSION:
186-
case DTLS1_BAD_VER:
177+
if (ssl->method->version != TLS_ANY_VERSION)
187178
return 0;
188-
default:
189-
break;
190-
}
191179
ssl->quic_method = quic_method;
192180
ssl->options &= ~SSL_OP_ENABLE_MIDDLEBOX_COMPAT;
193181
return 1;
@@ -225,6 +213,12 @@ int quic_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL level)
225213
/* May not have selected cipher, yet */
226214
const SSL_CIPHER *c = NULL;
227215

216+
/*
217+
* It probably doesn't make sense to use an (external) PSK session,
218+
* but in theory some kinds of external session caches could be
219+
* implemented using it, so allow psksession to be used as well as
220+
* the regular session.
221+
*/
228222
if (ssl->session != NULL)
229223
c = SSL_SESSION_get0_cipher(ssl->session);
230224
else if (ssl->psksession != NULL)
@@ -268,6 +262,11 @@ int SSL_process_quic_post_handshake(SSL *ssl)
268262
return 0;
269263
}
270264

265+
/*
266+
* This is always safe (we are sure to be at a record boundary) because
267+
* SSL_read()/SSL_write() are never used for QUIC connections -- the
268+
* application data is handled at the QUIC layer instead.
269+
*/
271270
ossl_statem_set_in_init(ssl, 1);
272271
ret = ssl->handshake_func(ssl);
273272
ossl_statem_set_in_init(ssl, 0);
@@ -281,5 +280,3 @@ int SSL_is_quic(SSL* ssl)
281280
{
282281
return SSL_IS_QUIC(ssl);
283282
}
284-
285-
#endif

‎deps/openssl/openssl/ssl/statem/extensions_clnt.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,7 @@ int tls_parse_stoc_early_data(SSL *s, PACKET *pkt, unsigned int context,
19361936
#ifndef OPENSSL_NO_QUIC
19371937
/*
19381938
* QUIC server must send 0xFFFFFFFF or it's a PROTOCOL_VIOLATION
1939-
* per draft-ietf-quic-tls-24 S4.5
1939+
* per draft-ietf-quic-tls-27 S4.5
19401940
*/
19411941
if (s->quic_method != NULL && max_early_data != 0xFFFFFFFF) {
19421942
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_PARSE_STOC_EARLY_DATA,
@@ -2045,7 +2045,8 @@ int tls_parse_stoc_quic_transport_params(SSL *s, PACKET *pkt, unsigned int conte
20452045
&s->ext.peer_quic_transport_params,
20462046
&s->ext.peer_quic_transport_params_len)) {
20472047
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
2048-
SSL_F_TLS_PARSE_STOC_QUIC_TRANSPORT_PARAMS, ERR_R_INTERNAL_ERROR);
2048+
SSL_F_TLS_PARSE_STOC_QUIC_TRANSPORT_PARAMS,
2049+
ERR_R_INTERNAL_ERROR);
20492050
return 0;
20502051
}
20512052
return 1;

0 commit comments

Comments
 (0)