From c2747c010f47d9ef1447b26470fa7fb033c543c3 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 21 Feb 2019 17:09:51 +0000 Subject: Change the alert callback return type from int to void. There is nothing for the handler to really signal, since it cannot change the fact that we received an alert. While here use TLS13_IO_FAILURE instead of hardcoding -1. ok tb@ --- src/lib/libssl/tls13_record_layer.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/lib/libssl/tls13_record_layer.c') diff --git a/src/lib/libssl/tls13_record_layer.c b/src/lib/libssl/tls13_record_layer.c index d1b53244c5..8f6eb94df4 100644 --- a/src/lib/libssl/tls13_record_layer.c +++ b/src/lib/libssl/tls13_record_layer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_record_layer.c,v 1.3 2019/02/21 17:02:02 jsing Exp $ */ +/* $OpenBSD: tls13_record_layer.c,v 1.4 2019/02/21 17:09:51 jsing Exp $ */ /* * Copyright (c) 2018, 2019 Joel Sing * @@ -188,21 +188,23 @@ tls13_record_layer_process_alert(struct tls13_record_layer *rl) * read channel closure (close_notify) or termination (all others). */ if (rl->rbuf == NULL) - return -1; + return TLS13_IO_FAILURE; if (rl->rbuf_content_type != SSL3_RT_ALERT) - return -1; + return TLS13_IO_FAILURE; if (!CBS_get_u8(&rl->rbuf_cbs, &alert_level)) - return -1; /* XXX - decode error alert. */ + return TLS13_IO_FAILURE; /* XXX - decode error alert. */ if (!CBS_get_u8(&rl->rbuf_cbs, &alert_desc)) - return -1; /* XXX - decode error alert. */ + return TLS13_IO_FAILURE; /* XXX - decode error alert. */ if (CBS_len(&rl->rbuf_cbs) != 0) - return -1; + return TLS13_IO_FAILURE; tls13_record_layer_rbuf_free(rl); - return rl->alert_cb(alert_level, alert_desc, rl->cb_arg); + rl->alert_cb(alert_level, alert_desc, rl->cb_arg); + + return TLS13_IO_SUCCESS; } int -- cgit v1.2.3-55-g6feb