diff options
| author |   beck <beck@openbsd.org> | 2020-01-21 03:40:05 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2020-01-21 03:40:05 +0000 |
| commit | 2bd6a703ff66d3d8457e82034bbf8ff945c78202 (patch) | |
| tree | 2c557c8ec824720efc4c3f238a40aa6217bb623a /lib/libssl/tls13_handshake.c | |
| parent | Whitespace fixes. No code change. (diff) | |
| download | wireguard-openbsd-2bd6a703ff66d3d8457e82034bbf8ff945c78202.tar.xz wireguard-openbsd-2bd6a703ff66d3d8457e82034bbf8ff945c78202.zip | |
Add alert processing in tls client code, by adding alert to the
tls13 context, and emiting the alert at the upper layers when
the lower level code fails
ok jsing@, tb@
Diffstat (limited to 'lib/libssl/tls13_handshake.c')
| -rw-r--r-- | lib/libssl/tls13_handshake.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/libssl/tls13_handshake.c b/lib/libssl/tls13_handshake.c index c86187caec5..48a01d3ca4e 100644 --- a/lib/libssl/tls13_handshake.c +++ b/lib/libssl/tls13_handshake.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_handshake.c,v 1.37 2020/01/20 22:04:17 beck Exp $ */ +/* $OpenBSD: tls13_handshake.c,v 1.38 2020/01/21 03:40:05 beck Exp $ */ /* * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org> * Copyright (c) 2019 Joel Sing <jsing@openbsd.org> @@ -291,7 +291,8 @@ tls13_handshake_perform(struct tls13_ctx *ctx) ctx->handshake_completed = 1; tls13_record_layer_handshake_completed(ctx->rl); return TLS13_IO_SUCCESS; - } + } else if (ctx->alert) + return tls13_send_alert(ctx->rl, ctx->alert); if (action->sender == ctx->mode) { if ((ret = tls13_handshake_send_action(ctx, action)) <= 0) @@ -329,6 +330,8 @@ tls13_handshake_send_action(struct tls13_ctx *ctx, /* XXX - provide CBB. */ if (!action->send(ctx)) return TLS13_IO_FAILURE; + else if (ctx->alert) + return tls13_send_alert(ctx->rl, ctx->alert); } if ((ret = tls13_handshake_msg_send(ctx->hs_msg, ctx->rl)) <= 0) @@ -389,6 +392,8 @@ tls13_handshake_recv_action(struct tls13_ctx *ctx, ret = TLS13_IO_FAILURE; if (action->recv(ctx)) ret = TLS13_IO_SUCCESS; + else if (ctx->alert) + ret = tls13_send_alert(ctx->rl, ctx->alert); tls13_handshake_msg_free(ctx->hs_msg); ctx->hs_msg = NULL; |