summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2020-10-03 17:22:27 +0000
committerjsing <>2020-10-03 17:22:27 +0000
commit0f1f8d13de82c94a30254ca849b3933f8356101b (patch)
tree5d67e3be4adb6b85a1784ef07ed7c2fae5de9dd8
parentfac102d465f978281849ca9c5bed44b183599623 (diff)
downloadopenbsd-0f1f8d13de82c94a30254ca849b3933f8356101b.tar.gz
openbsd-0f1f8d13de82c94a30254ca849b3933f8356101b.tar.bz2
openbsd-0f1f8d13de82c94a30254ca849b3933f8356101b.zip
Rename tls13_record_layer_alert() to tls13_record_layer_enqueue_alert()
This avoids naming confusion with an upcoming TLSv1.2 record layer change and is more descriptive of this function. Requested by tb@
-rw-r--r--src/lib/libssl/tls13_record_layer.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/tls13_record_layer.c b/src/lib/libssl/tls13_record_layer.c
index 1d75d9e5a4..e951d39e21 100644
--- a/src/lib/libssl/tls13_record_layer.c
+++ b/src/lib/libssl/tls13_record_layer.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_record_layer.c,v 1.53 2020/09/11 15:03:36 jsing Exp $ */ 1/* $OpenBSD: tls13_record_layer.c,v 1.54 2020/10/03 17:22:27 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -383,7 +383,7 @@ tls13_record_layer_send_pending(struct tls13_record_layer *rl)
383} 383}
384 384
385static ssize_t 385static ssize_t
386tls13_record_layer_alert(struct tls13_record_layer *rl, 386tls13_record_layer_enqueue_alert(struct tls13_record_layer *rl,
387 uint8_t alert_level, uint8_t alert_desc) 387 uint8_t alert_level, uint8_t alert_desc)
388{ 388{
389 CBB cbb; 389 CBB cbb;
@@ -1193,7 +1193,8 @@ tls13_send_alert(struct tls13_record_layer *rl, uint8_t alert_desc)
1193 alert_level = TLS13_ALERT_LEVEL_WARNING; 1193 alert_level = TLS13_ALERT_LEVEL_WARNING;
1194 1194
1195 do { 1195 do {
1196 ret = tls13_record_layer_alert(rl, alert_level, alert_desc); 1196 ret = tls13_record_layer_enqueue_alert(rl, alert_level,
1197 alert_desc);
1197 } while (ret == TLS13_IO_WANT_RETRY); 1198 } while (ret == TLS13_IO_WANT_RETRY);
1198 1199
1199 return ret; 1200 return ret;