RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-25 04:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: quic: Assemble QUIC TLS flags at the same level

Browse Source 
Do not distinguish the direction (TX/RX) when settings TLS secrets flags.
There is not such a distinction in the RFC 9001.
Assemble them at the same level: at the upper context level.
This commit is contained in:
Frédéric Lécaille 2022-02-25 17:17:59 +01:00 committed by Amaury Denoyelle
parent 9355d50f73
commit bd24208673
4 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/quic_loss.h
View File

@ -141,7 +141,7 @@ static inline struct quic_pktns *quic_pto_pktns(struct quic_conn *qc,
struct quic_enc_level *hel; struct quic_enc_level *hel;
hel = &qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE]; hel = &qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE];
if (hel->tls_ctx.tx.flags & QUIC_FL_TLS_SECRETS_SET) { if (hel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_SET) {
pktns = &qc->pktns[QUIC_TLS_PKTNS_HANDSHAKE]; pktns = &qc->pktns[QUIC_TLS_PKTNS_HANDSHAKE];
} }
else { else {

8
include/haproxy/quic_tls-t.h
View File

@ -91,7 +91,6 @@ enum quic_tls_pktns {
extern unsigned char initial_salt[20]; extern unsigned char initial_salt[20];
#define QUIC_FL_TLS_KP_BIT_SET (1 << 0)
/* Key phase used for Key Update */ /* Key phase used for Key Update */
struct quic_tls_kp { struct quic_tls_kp {
unsigned char *secret; unsigned char *secret;
@ -105,10 +104,12 @@ struct quic_tls_kp {
unsigned char flags; unsigned char flags;
}; };
/* Key update phase bit */
#define QUIC_FL_TLS_KP_BIT_SET (1 << 0)
/* Flag to be used when TLS secrets have been set. */ /* Flag to be used when TLS secrets have been set. */
#define QUIC_FL_TLS_SECRETS_SET (1 << 0) #define QUIC_FL_TLS_SECRETS_SET (1 << 1)
/* Flag to be used when TLS secrets have been discarded. */ /* Flag to be used when TLS secrets have been discarded. */
#define QUIC_FL_TLS_SECRETS_DCD (1 << 1) #define QUIC_FL_TLS_SECRETS_DCD (1 << 2)
struct quic_tls_secrets { struct quic_tls_secrets {
const EVP_CIPHER *aead; const EVP_CIPHER *aead;
@ -127,7 +128,6 @@ struct quic_tls_secrets {
unsigned char *key; unsigned char *key;
size_t keylen; size_t keylen;
int64_t pn; int64_t pn;
char flags;
}; };
struct quic_tls_ctx { struct quic_tls_ctx {

6
include/haproxy/quic_tls.h
View File

@ -460,8 +460,7 @@ static inline int quic_get_tls_enc_levels(enum quic_tls_enc_level *level,
*/ */
static inline void quic_tls_discard_keys(struct quic_enc_level *qel) static inline void quic_tls_discard_keys(struct quic_enc_level *qel)
{ {
qel->tls_ctx.rx.flags |= QUIC_FL_TLS_SECRETS_DCD; qel->tls_ctx.flags |= QUIC_FL_TLS_SECRETS_DCD;
qel->tls_ctx.tx.flags |= QUIC_FL_TLS_SECRETS_DCD;
} }
/* Derive the initial secrets with <ctx> as QUIC TLS context which is the /* Derive the initial secrets with <ctx> as QUIC TLS context which is the
@ -508,7 +507,6 @@ static inline int qc_new_isecs(struct quic_conn *qc,
rx_init_sec, sizeof rx_init_sec)) rx_init_sec, sizeof rx_init_sec))
goto err; goto err;
rx_ctx->flags |= QUIC_FL_TLS_SECRETS_SET;
if (!quic_tls_derive_keys(ctx->tx.aead, ctx->tx.hp, ctx->tx.md, if (!quic_tls_derive_keys(ctx->tx.aead, ctx->tx.hp, ctx->tx.md,
tx_ctx->key, tx_ctx->keylen, tx_ctx->key, tx_ctx->keylen,
tx_ctx->iv, tx_ctx->ivlen, tx_ctx->iv, tx_ctx->ivlen,
@ -516,7 +514,7 @@ static inline int qc_new_isecs(struct quic_conn *qc,
tx_init_sec, sizeof tx_init_sec)) tx_init_sec, sizeof tx_init_sec))
goto err; goto err;
tx_ctx->flags |= QUIC_FL_TLS_SECRETS_SET; ctx->flags |= QUIC_FL_TLS_SECRETS_SET;
TRACE_LEAVE(QUIC_EV_CONN_ISEC, NULL, rx_init_sec, tx_init_sec); TRACE_LEAVE(QUIC_EV_CONN_ISEC, NULL, rx_init_sec, tx_init_sec);
return 1; return 1;

50
src/xprt_quic.c
View File

@ -206,7 +206,7 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
const struct quic_conn *qc = a1; const struct quic_conn *qc = a1;
if (qc) { if (qc) {
const struct quic_tls_secrets *secs; const struct quic_tls_ctx *tls_ctx;
chunk_appendf(&trace_buf, " : qc@%p", qc); chunk_appendf(&trace_buf, " : qc@%p", qc);
if ((mask & QUIC_EV_CONN_INIT) && qc) { if ((mask & QUIC_EV_CONN_INIT) && qc) {
@ -236,19 +236,16 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
const unsigned char *rx_sec = a2; const unsigned char *rx_sec = a2;
const unsigned char *tx_sec = a3; const unsigned char *tx_sec = a3;
secs = &qc->els[level].tls_ctx.rx; tls_ctx = &qc->els[level].tls_ctx;
if (secs->flags & QUIC_FL_TLS_SECRETS_SET) { if (tls_ctx->flags & QUIC_FL_TLS_SECRETS_SET) {
chunk_appendf(&trace_buf, "\n RX el=%c", quic_enc_level_char(level)); chunk_appendf(&trace_buf, "\n RX el=%c", quic_enc_level_char(level));
if (rx_sec) if (rx_sec)
quic_tls_secret_hexdump(&trace_buf, rx_sec, 32); quic_tls_secret_hexdump(&trace_buf, rx_sec, 32);
quic_tls_keys_hexdump(&trace_buf, secs); quic_tls_keys_hexdump(&trace_buf, &tls_ctx->rx);
}
secs = &qc->els[level].tls_ctx.tx;
if (secs->flags & QUIC_FL_TLS_SECRETS_SET) {
chunk_appendf(&trace_buf, "\n TX el=%c", quic_enc_level_char(level)); chunk_appendf(&trace_buf, "\n TX el=%c", quic_enc_level_char(level));
if (tx_sec) if (tx_sec)
quic_tls_secret_hexdump(&trace_buf, tx_sec, 32); quic_tls_secret_hexdump(&trace_buf, tx_sec, 32);
quic_tls_keys_hexdump(&trace_buf, secs); quic_tls_keys_hexdump(&trace_buf, &tls_ctx->tx);
} }
} }
if (mask & (QUIC_EV_CONN_RSEC|QUIC_EV_CONN_RWSEC)) { if (mask & (QUIC_EV_CONN_RSEC|QUIC_EV_CONN_RWSEC)) {
@ -262,9 +259,9 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
chunk_appendf(&trace_buf, "\n RX el=%c", quic_enc_level_char(lvl)); chunk_appendf(&trace_buf, "\n RX el=%c", quic_enc_level_char(lvl));
if (secret && secret_len) if (secret && secret_len)
quic_tls_secret_hexdump(&trace_buf, secret, *secret_len); quic_tls_secret_hexdump(&trace_buf, secret, *secret_len);
secs = &qc->els[lvl].tls_ctx.rx; tls_ctx = &qc->els[lvl].tls_ctx;
if (secs->flags & QUIC_FL_TLS_SECRETS_SET) if (tls_ctx->flags & QUIC_FL_TLS_SECRETS_SET)
quic_tls_keys_hexdump(&trace_buf, secs); quic_tls_keys_hexdump(&trace_buf, &tls_ctx->rx);
} }
} }
@ -279,9 +276,9 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
chunk_appendf(&trace_buf, "\n TX el=%c", quic_enc_level_char(lvl)); chunk_appendf(&trace_buf, "\n TX el=%c", quic_enc_level_char(lvl));
if (secret && secret_len) if (secret && secret_len)
quic_tls_secret_hexdump(&trace_buf, secret, *secret_len); quic_tls_secret_hexdump(&trace_buf, secret, *secret_len);
secs = &qc->els[lvl].tls_ctx.tx; tls_ctx = &qc->els[lvl].tls_ctx;
if (secs->flags & QUIC_FL_TLS_SECRETS_SET) if (tls_ctx->flags & QUIC_FL_TLS_SECRETS_SET)
quic_tls_keys_hexdump(&trace_buf, secs); quic_tls_keys_hexdump(&trace_buf, &tls_ctx->tx);
} }
} }
@ -783,7 +780,6 @@ int ha_quic_set_encryption_secrets(SSL *ssl, enum ssl_encryption_level_t level,
goto err; goto err;
} }
rx->flags |= QUIC_FL_TLS_SECRETS_SET;
/* Enqueue this connection asap if we could derive O-RTT secrets as /* Enqueue this connection asap if we could derive O-RTT secrets as
* listener. Note that a listener derives only RX secrets for this * listener. Note that a listener derives only RX secrets for this
* level. * level.
@ -801,7 +797,6 @@ int ha_quic_set_encryption_secrets(SSL *ssl, enum ssl_encryption_level_t level,
goto err; goto err;
} }
tx->flags |= QUIC_FL_TLS_SECRETS_SET;
if (level == ssl_encryption_application) { if (level == ssl_encryption_application) {
struct quic_tls_kp *prv_rx = &qc->ku.prv_rx; struct quic_tls_kp *prv_rx = &qc->ku.prv_rx;
struct quic_tls_kp *nxt_rx = &qc->ku.nxt_rx; struct quic_tls_kp *nxt_rx = &qc->ku.nxt_rx;
@ -825,6 +820,7 @@ int ha_quic_set_encryption_secrets(SSL *ssl, enum ssl_encryption_level_t level,
} }
out: out:
tls_ctx->flags |= QUIC_FL_TLS_SECRETS_SET;
TRACE_LEAVE(QUIC_EV_CONN_RWSEC, qc, &level); TRACE_LEAVE(QUIC_EV_CONN_RWSEC, qc, &level);
return 1; return 1;
@ -2295,7 +2291,7 @@ static int qc_parse_pkt_frms(struct quic_rx_packet *pkt, struct ssl_sock_ctx *ct
{ {
struct quic_rx_crypto_frm *cf; struct quic_rx_crypto_frm *cf;
if (unlikely(qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_DCD)) { if (unlikely(qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_DCD)) {
/* XXX TO DO: <cfdebug> is used only for the traces. */ /* XXX TO DO: <cfdebug> is used only for the traces. */
struct quic_rx_crypto_frm cfdebug = { }; struct quic_rx_crypto_frm cfdebug = { };
@ -2512,7 +2508,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct qring *qr,
* and if there is no more CRYPTO data available or in flight * and if there is no more CRYPTO data available or in flight
* congestion control limit is reached for prepared data * congestion control limit is reached for prepared data
*/ */
if (!(qel->tls_ctx.tx.flags & QUIC_FL_TLS_SECRETS_SET) || if (!(qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_SET) ||
(!cc && !ack && !probe && (!cc && !ack && !probe &&
(LIST_ISEMPTY(&qel->pktns->tx.frms) || (LIST_ISEMPTY(&qel->pktns->tx.frms) ||
qc->path->prep_in_flight >= qc->path->cwnd))) { qc->path->prep_in_flight >= qc->path->cwnd))) {
@ -3144,12 +3140,12 @@ static int qc_qel_may_rm_hp(struct quic_conn *qc, struct quic_enc_level *qel)
tel = ssl_to_quic_enc_level(qel->level); tel = ssl_to_quic_enc_level(qel->level);
/* check if tls secrets are available */ /* check if tls secrets are available */
if (qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_DCD) { if (qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_DCD) {
TRACE_DEVEL("Discarded keys", QUIC_EV_CONN_TRMHP, qc); TRACE_DEVEL("Discarded keys", QUIC_EV_CONN_TRMHP, qc);
return 0; return 0;
} }
if (!(qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_SET)) if (!(qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_SET))
return 0; return 0;
/* check if the connection layer is ready before using app level */ /* check if the connection layer is ready before using app level */
@ -3277,7 +3273,7 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
goto err; goto err;
if (zero_rtt && next_qel && !MT_LIST_ISEMPTY(&next_qel->rx.pqpkts) && if (zero_rtt && next_qel && !MT_LIST_ISEMPTY(&next_qel->rx.pqpkts) &&
(next_qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_SET)) { (next_qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_SET)) {
qel = next_qel; qel = next_qel;
next_qel = NULL; next_qel = NULL;
goto next_level; goto next_level;
@ -3289,7 +3285,7 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
!quic_build_post_handshake_frames(qc)) !quic_build_post_handshake_frames(qc))
goto err; goto err;
if (!(qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE].tls_ctx.rx.flags & if (!(qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE].tls_ctx.flags &
QUIC_FL_TLS_SECRETS_DCD)) { QUIC_FL_TLS_SECRETS_DCD)) {
/* Discard the Handshake keys. */ /* Discard the Handshake keys. */
quic_tls_discard_keys(&qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE]); quic_tls_discard_keys(&qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE]);
@ -3326,7 +3322,7 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
/* Check if there is something to do for the next level. /* Check if there is something to do for the next level.
*/ */
if (next_qel && next_qel != qel && if (next_qel && next_qel != qel &&
(next_qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_SET) && (next_qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_SET) &&
(!MT_LIST_ISEMPTY(&next_qel->rx.pqpkts) || qc_el_rx_pkts(next_qel))) { (!MT_LIST_ISEMPTY(&next_qel->rx.pqpkts) || qc_el_rx_pkts(next_qel))) {
qel = next_qel; qel = next_qel;
next_qel = NULL; next_qel = NULL;
@ -3372,8 +3368,6 @@ static int quic_conn_enc_level_init(struct quic_conn *qc,
qel->tls_ctx.rx.aead = qel->tls_ctx.tx.aead = NULL; qel->tls_ctx.rx.aead = qel->tls_ctx.tx.aead = NULL;
qel->tls_ctx.rx.md = qel->tls_ctx.tx.md = NULL; qel->tls_ctx.rx.md = qel->tls_ctx.tx.md = NULL;
qel->tls_ctx.rx.hp = qel->tls_ctx.tx.hp = NULL; qel->tls_ctx.rx.hp = qel->tls_ctx.tx.hp = NULL;
qel->tls_ctx.rx.flags = 0;
qel->tls_ctx.tx.flags = 0;
qel->tls_ctx.flags = 0; qel->tls_ctx.flags = 0;
qel->rx.pkts = EB_ROOT; qel->rx.pkts = EB_ROOT;
@ -3534,9 +3528,9 @@ static struct task *process_timer(struct task *task, void *ctx, unsigned int sta
struct quic_enc_level *iel = &qc->els[QUIC_TLS_ENC_LEVEL_INITIAL]; struct quic_enc_level *iel = &qc->els[QUIC_TLS_ENC_LEVEL_INITIAL];
struct quic_enc_level *hel = &qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE]; struct quic_enc_level *hel = &qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE];
if (hel->tls_ctx.rx.flags == QUIC_FL_TLS_SECRETS_SET) if (hel->tls_ctx.flags == QUIC_FL_TLS_SECRETS_SET)
hel->pktns->tx.pto_probe = 1; hel->pktns->tx.pto_probe = 1;
if (iel->tls_ctx.rx.flags == QUIC_FL_TLS_SECRETS_SET) if (iel->tls_ctx.flags == QUIC_FL_TLS_SECRETS_SET)
iel->pktns->tx.pto_probe = 1; iel->pktns->tx.pto_probe = 1;
} }
@ -3806,7 +3800,7 @@ static inline int qc_try_rm_hp(struct quic_conn *qc,
qpkt_trace = pkt; qpkt_trace = pkt;
} }
else { else {
if (qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_DCD) { if (qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_DCD) {
/* If the packet number space has been discarded, this packet /* If the packet number space has been discarded, this packet
* will be not parsed. * will be not parsed.
*/ */