Skip to content

Commit

Permalink
QUIC: respond to Rich's comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Watson Ladd authored and wbl committed Sep 23, 2024
1 parent d72766b commit 96b7f14
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ should use the official OpenSSL distributions.
The APIs here are used by Microsoft's
[MsQuic](https://github.com/microsoft/msquic) and Google's
[Chromium QUIC](https://chromium.googlesource.com/chromium/src/+/master/net/quic/)
QUIC implementations, among others.

We are not in competition with OpenSSL project. We informed them of
our plans to fork the code before we went public. We do not speak for the
Expand All @@ -28,12 +29,12 @@ As stated in their blog post, the OpenSSL team is focused on their 3.0 release
There is a community need for a QUIC-capable TLS library. This fork is intended
as stopgap solution to enable higher level frameworks and runtimes to use QUIC
with the proven and reliable TLS functionality from OpenSSL. This fork will be
maintained until OpenSSL officially provides reasonable support for QUIC
maintained until OpenSSL officially provides reasonable support for other QUIC
implementations.

This fork can be considered a supported version of
[OpenSSL PR 8797](https://github.com/openssl/openssl/pull/8797).
We will endeavor to track OpenSSL releases within a day or so, and there is an
We will endeavor to track OpenSSL releases within days, and there is an
item below about how we'll follow their tagging.

On to the questions and answers.
Expand Down
9 changes: 3 additions & 6 deletions ssl/ssl_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ int SSL_clear(SSL *s)
int SSL_clear_quic(SSL *s)
{
SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);

OPENSSL_free(sc->ext.peer_quic_transport_params_draft);
sc->ext.peer_quic_transport_params_draft = NULL;
sc->ext.peer_quic_transport_params_draft_len = 0;
Expand All @@ -579,9 +580,7 @@ int SSL_clear_quic(SSL *s)
sc->quic_write_level = ssl_encryption_initial;
sc->quic_latest_level_received = ssl_encryption_initial;
while (sc->quic_input_data_head != NULL) {
QUIC_DATA *qd;

qd = sc->quic_input_data_head;
QUIC_DATA *qd = sc->quic_input_data_head;
sc->quic_input_data_head = qd->next;
OPENSSL_free(qd);
}
Expand Down Expand Up @@ -1515,9 +1514,7 @@ void ossl_ssl_connection_free(SSL *ssl)
OPENSSL_free(s->ext.peer_quic_transport_params);
BUF_MEM_free(s->quic_buf);
while (s->quic_input_data_head != NULL) {
QUIC_DATA *qd;

qd = s->quic_input_data_head;
QUIC_DATA *qd = s->quic_input_data_head;
s->quic_input_data_head = qd->next;
OPENSSL_free(qd);
}
Expand Down
2 changes: 1 addition & 1 deletion ssl/statem/statem_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ int ssl3_do_write(SSL_CONNECTION *s, uint8_t type)
s->init_num);
if (!ret) {
ret = -1;
/* QUIC can't sent anything out sice the above failed */
/* QUIC can't sent anything out since the above failed */
ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
} else {
written = s->init_num;
Expand Down

0 comments on commit 96b7f14

Please sign in to comment.