mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 16:42:56 -08:00
Code

Fix alert callback in the QUIC layer

Browse Source 
Only close_notify and user_cancelled are warning alerts. All others
should be fatal. In order for the lower layers to behave correctly,
the return code for fatal alerts needs to be TLS13_IO_ALERT instead
of TLS13_IO_SUCCESS.

Failure to signal handshake failure in the public API led to a crash
in HAProxy when forcing the tls cipher to TLS_AES_128_CCM_SHA256 as
found by haproxyfred while investigating
https://github.com/haproxy/haproxy/issues/2569

Kenjiro Nakayama found misbehavior of ngtcp2-based servers, wrote a
similar patch and tested this version.

Fixes https://github.com/libressl/portable/issues/1093

ok jsing
This commit is contained in:
tb 2024-09-09 03:55:55 +00:00
parent d2b6e45e60
commit 9987920c21
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libssl/tls13_quic.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tls13_quic.c,v 1.7 2022/11/26 16:08:56 tb Exp $ */ /* $OpenBSD: tls13_quic.c,v 1.8 2024/09/09 03:55:55 tb Exp $ */
/* /*
* Copyright (c) 2022 Joel Sing <jsing@openbsd.org> * Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
* *
@ -131,6 +131,8 @@ tls13_quic_alert_send_cb(int alert_desc, void *arg)
{ {
struct tls13_ctx *ctx = arg; struct tls13_ctx *ctx = arg;
SSL *ssl = ctx->ssl; SSL *ssl = ctx->ssl;
uint8_t alert_level = TLS13_ALERT_LEVEL_FATAL;
int ret = TLS13_IO_ALERT;
if (!ssl->quic_method->send_alert(ssl, ctx->hs->tls13.quic_write_level, if (!ssl->quic_method->send_alert(ssl, ctx->hs->tls13.quic_write_level,
alert_desc)) { alert_desc)) {
@ -138,7 +140,15 @@ tls13_quic_alert_send_cb(int alert_desc, void *arg)
return TLS13_IO_FAILURE; return TLS13_IO_FAILURE;
} }
return TLS13_IO_SUCCESS; if (alert_desc == TLS13_ALERT_CLOSE_NOTIFY ||
alert_desc == TLS13_ALERT_USER_CANCELED) {
alert_level = TLS13_ALERT_LEVEL_WARNING;
ret = TLS13_IO_SUCCESS;
}
tls13_record_layer_alert_sent(ctx->rl, alert_level, alert_desc);
return ret;
} }
static const struct tls13_record_layer_callbacks quic_rl_callbacks = { static const struct tls13_record_layer_callbacks quic_rl_callbacks = {