diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2020-03-10 17:15:03 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2020-03-10 17:15:03 +0000 |
| commit | 72c636ed31ac8e2fa622f9135bf5b95f7c856f74 (patch) | |
| tree | 4cf29a4aaae0333d8223b3b202e0a8adffed3af1 /lib | |
| parent | fdbb50a5dcf26fd21a42577cdcde82b8fbeda6d1 (diff) | |
Remove some unnecessary handshake enums/functions.
Both session tickets and key updates are post-handshake handshake messages,
which were originally included in the handshake code.
ok inoguchi@ tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/tls13_handshake.c | 8 | ||||
| -rw-r--r-- | lib/libssl/tls13_handshake.h | 4 | ||||
| -rw-r--r-- | lib/libssl/tls13_internal.h | 4 | ||||
| -rw-r--r-- | lib/libssl/tls13_server.c | 14 |
4 files changed, 4 insertions, 26 deletions
diff --git a/lib/libssl/tls13_handshake.c b/lib/libssl/tls13_handshake.c index 677fca3cf30..51585d31bab 100644 --- a/lib/libssl/tls13_handshake.c +++ b/lib/libssl/tls13_handshake.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_handshake.c,v 1.51 2020/02/05 16:42:29 jsing Exp $ */ +/* $OpenBSD: tls13_handshake.c,v 1.52 2020/03/10 17:15:02 jsing Exp $ */ /* * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org> * Copyright (c) 2019 Joel Sing <jsing@openbsd.org> @@ -89,12 +89,6 @@ struct tls13_handshake_action state_machine[] = { .sent = tls13_client_finished_sent, .recv = tls13_client_finished_recv, }, - [CLIENT_KEY_UPDATE] = { - .handshake_type = TLS13_MT_KEY_UPDATE, - .sender = TLS13_HS_CLIENT, - .send = tls13_client_key_update_send, - .recv = tls13_client_key_update_recv, - }, [SERVER_HELLO] = { .handshake_type = TLS13_MT_SERVER_HELLO, .sender = TLS13_HS_SERVER, diff --git a/lib/libssl/tls13_handshake.h b/lib/libssl/tls13_handshake.h index 9910dab106d..956d27c61aa 100644 --- a/lib/libssl/tls13_handshake.h +++ b/lib/libssl/tls13_handshake.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_handshake.h,v 1.3 2019/04/05 20:23:38 tb Exp $ */ +/* $OpenBSD: tls13_handshake.h,v 1.4 2020/03/10 17:15:02 jsing Exp $ */ /* * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> * @@ -45,8 +45,6 @@ enum tls13_message_type { CLIENT_CERTIFICATE, CLIENT_CERTIFICATE_VERIFY, CLIENT_FINISHED, - CLIENT_KEY_UPDATE, - SERVER_NEW_SESSION_TICKET, APPLICATION_DATA, TLS13_NUM_MESSAGE_TYPES, }; diff --git a/lib/libssl/tls13_internal.h b/lib/libssl/tls13_internal.h index 76b1ebf9143..053a7972a05 100644 --- a/lib/libssl/tls13_internal.h +++ b/lib/libssl/tls13_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_internal.h,v 1.60 2020/02/05 16:42:29 jsing Exp $ */ +/* $OpenBSD: tls13_internal.h,v 1.61 2020/03/10 17:15:02 jsing Exp $ */ /* * Copyright (c) 2018 Bob Beck <beck@openbsd.org> * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> @@ -304,8 +304,6 @@ int tls13_client_certificate_verify_recv(struct tls13_ctx *ctx, CBS *cbs); int tls13_client_finished_recv(struct tls13_ctx *ctx, CBS *cbs); int tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb); int tls13_client_finished_sent(struct tls13_ctx *ctx); -int tls13_client_key_update_send(struct tls13_ctx *ctx, CBB *cbb); -int tls13_client_key_update_recv(struct tls13_ctx *ctx, CBS *cbs); int tls13_server_hello_recv(struct tls13_ctx *ctx, CBS *cbs); int tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb); int tls13_server_hello_sent(struct tls13_ctx *ctx); diff --git a/lib/libssl/tls13_server.c b/lib/libssl/tls13_server.c index eb865bcfb1a..edffd452390 100644 --- a/lib/libssl/tls13_server.c +++ b/lib/libssl/tls13_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_server.c,v 1.26 2020/02/23 17:51:36 tb Exp $ */ +/* $OpenBSD: tls13_server.c,v 1.27 2020/03/10 17:15:02 jsing Exp $ */ /* * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> * Copyright (c) 2020 Bob Beck <beck@openbsd.org> @@ -488,18 +488,6 @@ tls13_client_certificate_verify_recv(struct tls13_ctx *ctx, CBS *cbs) return ret; } -int -tls13_client_key_update_send(struct tls13_ctx *ctx, CBB *cbb) -{ - return 0; -} - -int -tls13_client_key_update_recv(struct tls13_ctx *ctx, CBS *cbs) -{ - return 0; -} - static int tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb) { |