mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-05 14:10:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of the Dummy Handshake Layer with the real one

Browse Source 
We start using the QUIC TLS implementation rather than the dummy one.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19748)
This commit is contained in:
Matt Caswell 2022-11-18 12:38:50 +00:00
parent 19863d497d
commit 2723d705b5
6 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/internal/quic_channel.h
View File

@ -59,6 +59,7 @@ typedef struct quic_channel_args_st {
OSSL_LIB_CTX *libctx; OSSL_LIB_CTX *libctx;
const char *propq; const char *propq;
int is_server; int is_server;
SSL *tls;
} QUIC_CHANNEL_ARGS; } QUIC_CHANNEL_ARGS;
typedef struct quic_channel_st QUIC_CHANNEL; typedef struct quic_channel_st QUIC_CHANNEL;

1
include/openssl/tls1.h
View File

@ -150,6 +150,7 @@ extern "C" {
# define TLSEXT_TYPE_post_handshake_auth 49 # define TLSEXT_TYPE_post_handshake_auth 49
# define TLSEXT_TYPE_signature_algorithms_cert 50 # define TLSEXT_TYPE_signature_algorithms_cert 50
# define TLSEXT_TYPE_key_share 51 # define TLSEXT_TYPE_key_share 51
# define TLSEXT_TYPE_quic_transport_parameters 57
/* Temporary extension type */ /* Temporary extension type */
# define TLSEXT_TYPE_renegotiate 0xff01 # define TLSEXT_TYPE_renegotiate 0xff01

42
ssl/quic/quic_channel.c
View File

@ -101,7 +101,7 @@ static int ch_init(QUIC_CHANNEL *ch)
OSSL_QUIC_TX_PACKETISER_ARGS txp_args = {0}; OSSL_QUIC_TX_PACKETISER_ARGS txp_args = {0};
OSSL_QTX_ARGS qtx_args = {0}; OSSL_QTX_ARGS qtx_args = {0};
OSSL_QRX_ARGS qrx_args = {0}; OSSL_QRX_ARGS qrx_args = {0};
QUIC_DHS_ARGS dhs_args = {0}; QUIC_TLS_ARGS tls_args = {0};
uint32_t pn_space; uint32_t pn_space;
size_t rx_short_cid_len = ch->is_server ? INIT_DCID_LEN : 0; size_t rx_short_cid_len = ch->is_server ? INIT_DCID_LEN : 0;
@ -233,22 +233,23 @@ static int ch_init(QUIC_CHANNEL *ch)
get_time, NULL)) get_time, NULL))
goto err; goto err;
/* Plug in the dummy handshake layer. */ /* Plug in the TLS handshake layer. */
dhs_args.crypto_send_cb = ch_on_crypto_send; tls_args.s = ch->tls;
dhs_args.crypto_send_cb_arg = ch; tls_args.crypto_send_cb = ch_on_crypto_send;
dhs_args.crypto_recv_cb = ch_on_crypto_recv; tls_args.crypto_send_cb_arg = ch;
dhs_args.crypto_recv_cb_arg = ch; tls_args.crypto_recv_cb = ch_on_crypto_recv;
dhs_args.yield_secret_cb = ch_on_handshake_yield_secret; tls_args.crypto_recv_cb_arg = ch;
dhs_args.yield_secret_cb_arg = ch; tls_args.yield_secret_cb = ch_on_handshake_yield_secret;
dhs_args.got_transport_params_cb = ch_on_transport_params; tls_args.yield_secret_cb_arg = ch;
dhs_args.got_transport_params_cb_arg= ch; tls_args.got_transport_params_cb = ch_on_transport_params;
dhs_args.handshake_complete_cb = ch_on_handshake_complete; tls_args.got_transport_params_cb_arg= ch;
dhs_args.handshake_complete_cb_arg = ch; tls_args.handshake_complete_cb = ch_on_handshake_complete;
dhs_args.alert_cb = ch_on_handshake_alert; tls_args.handshake_complete_cb_arg = ch;
dhs_args.alert_cb_arg = ch; tls_args.alert_cb = ch_on_handshake_alert;
dhs_args.is_server = ch->is_server; tls_args.alert_cb_arg = ch;
tls_args.is_server = ch->is_server;
if ((ch->dhs = ossl_quic_dhs_new(&dhs_args)) == NULL) if ((ch->qtls = ossl_quic_tls_new(&tls_args)) == NULL)
goto err; goto err;
/* /*
@ -311,7 +312,7 @@ static void ch_cleanup(QUIC_CHANNEL *ch)
ossl_qrx_pkt_release(ch->qrx_pkt); ossl_qrx_pkt_release(ch->qrx_pkt);
ch->qrx_pkt = NULL; ch->qrx_pkt = NULL;
ossl_quic_dhs_free(ch->dhs); ossl_quic_tls_free(ch->qtls);
ossl_qrx_free(ch->qrx); ossl_qrx_free(ch->qrx);
ossl_quic_demux_free(ch->demux); ossl_quic_demux_free(ch->demux);
OPENSSL_free(ch->local_transport_params); OPENSSL_free(ch->local_transport_params);
@ -327,6 +328,7 @@ QUIC_CHANNEL *ossl_quic_channel_new(const QUIC_CHANNEL_ARGS *args)
ch->libctx = args->libctx; ch->libctx = args->libctx;
ch->propq = args->propq; ch->propq = args->propq;
ch->is_server = args->is_server; ch->is_server = args->is_server;
ch->tls = args->tls;
if (!ch_init(ch)) { if (!ch_init(ch)) {
OPENSSL_free(ch); OPENSSL_free(ch);
@ -1137,7 +1139,7 @@ static int ch_generate_transport_params(QUIC_CHANNEL *ch)
wpkt_valid = 0; wpkt_valid = 0;
if (!ossl_quic_dhs_set_transport_params(ch->dhs, ch->local_transport_params, if (!ossl_quic_tls_set_transport_params(ch->qtls, ch->local_transport_params,
buf_len)) buf_len))
goto err; goto err;
@ -1211,7 +1213,7 @@ static void ch_tick(QUIC_TICK_RESULT *res, void *arg)
* new outgoing data. * new outgoing data.
*/ */
ch->have_new_rx_secret = 0; ch->have_new_rx_secret = 0;
ossl_quic_dhs_tick(ch->dhs); ossl_quic_tls_tick(ch->qtls);
/* /*
* If the handshake layer gave us a new secret, we need to do RX again * If the handshake layer gave us a new secret, we need to do RX again
@ -1702,7 +1704,7 @@ int ossl_quic_channel_start(QUIC_CHANNEL *ch)
ch->doing_proactive_ver_neg = 0; /* not currently supported */ ch->doing_proactive_ver_neg = 0; /* not currently supported */
/* Handshake layer: start (e.g. send CH). */ /* Handshake layer: start (e.g. send CH). */
if (!ossl_quic_dhs_tick(ch->dhs)) if (!ossl_quic_tls_tick(ch->qtls))
return 0; return 0;
ossl_quic_reactor_tick(&ch->rtor); /* best effort */ ossl_quic_reactor_tick(&ch->rtor); /* best effort */

4
ssl/quic/quic_channel_local.h
View File

@ -57,8 +57,8 @@ struct quic_channel_st {
* layer; its 'network' side is plugged into the crypto stream for each EL * layer; its 'network' side is plugged into the crypto stream for each EL
* (other than the 0-RTT EL). * (other than the 0-RTT EL).
*/ */
QUIC_DHS *dhs; QUIC_TLS *qtls;
/* TODO(QUIC): Replace this with a QUIC_TLS instance when ready. */ SSL *tls;
/* /*
* The transport parameter block we will send or have sent. * The transport parameter block we will send or have sent.

3
ssl/quic/quic_impl.c
View File

@ -12,7 +12,7 @@
#include <openssl/sslerr.h> #include <openssl/sslerr.h>
#include <crypto/rand.h> #include <crypto/rand.h>
#include "quic_local.h" #include "quic_local.h"
#include "internal/quic_dummy_handshake.h" #include "internal/quic_tls.h"
#include "internal/quic_rx_depack.h" #include "internal/quic_rx_depack.h"
#include "internal/quic_error.h" #include "internal/quic_error.h"
#include "internal/time.h" #include "internal/time.h"
@ -590,6 +590,7 @@ static int ensure_channel_and_start(QUIC_CONNECTION *qc)
args.libctx = qc->ssl.ctx->libctx; args.libctx = qc->ssl.ctx->libctx;
args.propq = qc->ssl.ctx->propq; args.propq = qc->ssl.ctx->propq;
args.is_server = 0; args.is_server = 0;
args.tls = qc->tls;
qc->ch = ossl_quic_channel_new(&args); qc->ch = ossl_quic_channel_new(&args);
if (qc->ch == NULL) if (qc->ch == NULL)

2
ssl/quic/quic_local.h
View File

@ -16,7 +16,7 @@
# include "internal/quic_statm.h" # include "internal/quic_statm.h"
# include "internal/quic_demux.h" # include "internal/quic_demux.h"
# include "internal/quic_record_rx.h" # include "internal/quic_record_rx.h"
# include "internal/quic_dummy_handshake.h" # include "internal/quic_tls.h"
# include "internal/quic_fc.h" # include "internal/quic_fc.h"
# include "internal/quic_stream.h" # include "internal/quic_stream.h"
# include "internal/quic_channel.h" # include "internal/quic_channel.h"