diff options
author | jsing <> | 2022-07-20 06:32:24 +0000 |
---|---|---|
committer | jsing <> | 2022-07-20 06:32:24 +0000 |
commit | ccb4f685d743447d79e76e1380f93ba28b5b8e1e (patch) | |
tree | 71c8f3c98cc3af4e296c929982738339c5534368 /src/lib/libssl/tls13_internal.h | |
parent | 65be960bd3c39cb5e24e7479f7f1dfd10d8c6f69 (diff) | |
download | openbsd-ccb4f685d743447d79e76e1380f93ba28b5b8e1e.tar.gz openbsd-ccb4f685d743447d79e76e1380f93ba28b5b8e1e.tar.bz2 openbsd-ccb4f685d743447d79e76e1380f93ba28b5b8e1e.zip |
Remove tls_buffer_set_data() and remove/revise callers.
There is no way that tls_buffer_set_data() can currently work in
conjunction with tls_buffer_expand(). This fact is currently hidden by the
way that PHH works, which reads the same data from the record layer (which
it needs to do anyway, since we may not have all of the handshake message
in a single record).
Since this is broken, mop it up and change the PHH callback to not provide
the record data.
ok beck@ tb@
Diffstat (limited to 'src/lib/libssl/tls13_internal.h')
-rw-r--r-- | src/lib/libssl/tls13_internal.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/tls13_internal.h b/src/lib/libssl/tls13_internal.h index 555dd4262e..599eb200cb 100644 --- a/src/lib/libssl/tls13_internal.h +++ b/src/lib/libssl/tls13_internal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_internal.h,v 1.98 2022/07/17 15:49:20 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_internal.h,v 1.99 2022/07/20 06:32:24 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> |
@@ -88,7 +88,7 @@ __BEGIN_HIDDEN_DECLS | |||
88 | #define TLS13_INFO_CONNECT_EXIT SSL_CB_CONNECT_EXIT | 88 | #define TLS13_INFO_CONNECT_EXIT SSL_CB_CONNECT_EXIT |
89 | 89 | ||
90 | typedef void (*tls13_alert_cb)(uint8_t _alert_desc, void *_cb_arg); | 90 | typedef void (*tls13_alert_cb)(uint8_t _alert_desc, void *_cb_arg); |
91 | typedef ssize_t (*tls13_phh_recv_cb)(void *_cb_arg, CBS *_cbs); | 91 | typedef ssize_t (*tls13_phh_recv_cb)(void *_cb_arg); |
92 | typedef void (*tls13_phh_sent_cb)(void *_cb_arg); | 92 | typedef void (*tls13_phh_sent_cb)(void *_cb_arg); |
93 | typedef void (*tls13_handshake_message_cb)(void *_cb_arg); | 93 | typedef void (*tls13_handshake_message_cb)(void *_cb_arg); |
94 | typedef void (*tls13_info_cb)(void *_cb_arg, int _state, int _ret); | 94 | typedef void (*tls13_info_cb)(void *_cb_arg, int _state, int _ret); |
@@ -226,7 +226,6 @@ struct tls13_handshake_msg; | |||
226 | struct tls13_handshake_msg *tls13_handshake_msg_new(void); | 226 | struct tls13_handshake_msg *tls13_handshake_msg_new(void); |
227 | void tls13_handshake_msg_free(struct tls13_handshake_msg *msg); | 227 | void tls13_handshake_msg_free(struct tls13_handshake_msg *msg); |
228 | void tls13_handshake_msg_data(struct tls13_handshake_msg *msg, CBS *cbs); | 228 | void tls13_handshake_msg_data(struct tls13_handshake_msg *msg, CBS *cbs); |
229 | int tls13_handshake_msg_set_buffer(struct tls13_handshake_msg *msg, CBS *cbs); | ||
230 | uint8_t tls13_handshake_msg_type(struct tls13_handshake_msg *msg); | 229 | uint8_t tls13_handshake_msg_type(struct tls13_handshake_msg *msg); |
231 | int tls13_handshake_msg_content(struct tls13_handshake_msg *msg, CBS *cbs); | 230 | int tls13_handshake_msg_content(struct tls13_handshake_msg *msg, CBS *cbs); |
232 | int tls13_handshake_msg_start(struct tls13_handshake_msg *msg, CBB *body, | 231 | int tls13_handshake_msg_start(struct tls13_handshake_msg *msg, CBB *body, |