From d2039e7348559d4183f5d055e691e70e1dadf349 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 23 Oct 2021 13:12:14 +0000 Subject: Rename tls13_buffer to tls_buffer. This code will soon be used in the DTLSv1.2 and TLSv1.2 stack. Also introduce tls_internal.h and move/rename the read/write/flush callbacks. ok beck@ tb@ --- src/lib/libssl/tls13_handshake_msg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/lib/libssl/tls13_handshake_msg.c') diff --git a/src/lib/libssl/tls13_handshake_msg.c b/src/lib/libssl/tls13_handshake_msg.c index ff6d6d7e19..67eab3152f 100644 --- a/src/lib/libssl/tls13_handshake_msg.c +++ b/src/lib/libssl/tls13_handshake_msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_handshake_msg.c,v 1.3 2021/05/16 14:19:04 jsing Exp $ */ +/* $OpenBSD: tls13_handshake_msg.c,v 1.4 2021/10/23 13:12:14 jsing Exp $ */ /* * Copyright (c) 2018, 2019 Joel Sing * @@ -28,7 +28,7 @@ struct tls13_handshake_msg { uint8_t *data; size_t data_len; - struct tls13_buffer *buf; + struct tls_buffer *buf; CBS cbs; CBB cbb; }; @@ -40,7 +40,7 @@ tls13_handshake_msg_new() if ((msg = calloc(1, sizeof(struct tls13_handshake_msg))) == NULL) goto err; - if ((msg->buf = tls13_buffer_new(0)) == NULL) + if ((msg->buf = tls_buffer_new(0)) == NULL) goto err; return msg; @@ -57,7 +57,7 @@ tls13_handshake_msg_free(struct tls13_handshake_msg *msg) if (msg == NULL) return; - tls13_buffer_free(msg->buf); + tls_buffer_free(msg->buf); CBB_cleanup(&msg->cbb); @@ -74,7 +74,7 @@ tls13_handshake_msg_data(struct tls13_handshake_msg *msg, CBS *cbs) int tls13_handshake_msg_set_buffer(struct tls13_handshake_msg *msg, CBS *cbs) { - return tls13_buffer_set_data(msg->buf, cbs); + return tls_buffer_set_data(msg->buf, cbs); } uint8_t @@ -137,12 +137,12 @@ tls13_handshake_msg_recv(struct tls13_handshake_msg *msg, return TLS13_IO_FAILURE; if (msg->msg_type == 0) { - if ((ret = tls13_buffer_extend(msg->buf, + if ((ret = tls_buffer_extend(msg->buf, TLS13_HANDSHAKE_MSG_HEADER_LEN, tls13_handshake_msg_read_cb, rl)) <= 0) return ret; - tls13_buffer_cbs(msg->buf, &cbs); + tls_buffer_cbs(msg->buf, &cbs); if (!CBS_get_u8(&cbs, &msg_type)) return TLS13_IO_FAILURE; @@ -157,12 +157,12 @@ tls13_handshake_msg_recv(struct tls13_handshake_msg *msg, msg->msg_len = msg_len; } - if ((ret = tls13_buffer_extend(msg->buf, + if ((ret = tls_buffer_extend(msg->buf, TLS13_HANDSHAKE_MSG_HEADER_LEN + msg->msg_len, tls13_handshake_msg_read_cb, rl)) <= 0) return ret; - if (!tls13_buffer_finish(msg->buf, &msg->data, &msg->data_len)) + if (!tls_buffer_finish(msg->buf, &msg->data, &msg->data_len)) return TLS13_IO_FAILURE; return TLS13_IO_SUCCESS; -- cgit v1.2.3-55-g6feb