summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2019-02-28 17:39:36 +0000
committerjsing <>2019-02-28 17:39:36 +0000
commita97fd3cdf75bfc81769e93d61df1b8cb4da9bc82 (patch)
treecfe3520b8e8b4cc8c11a451e02a2f4045469d71f
parent778ac3e976e281b000c75112e6850b1dff1a0621 (diff)
downloadopenbsd-a97fd3cdf75bfc81769e93d61df1b8cb4da9bc82.tar.gz
openbsd-a97fd3cdf75bfc81769e93d61df1b8cb4da9bc82.tar.bz2
openbsd-a97fd3cdf75bfc81769e93d61df1b8cb4da9bc82.zip
Remove unused record_type from TLSv1.3 handshake actions.
ok tb@
-rw-r--r--src/lib/libssl/tls13_handshake.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/libssl/tls13_handshake.c b/src/lib/libssl/tls13_handshake.c
index 598a7c1666..d4fc7cb6f7 100644
--- a/src/lib/libssl/tls13_handshake.c
+++ b/src/lib/libssl/tls13_handshake.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_handshake.c,v 1.29 2019/02/25 16:46:17 jsing Exp $ */ 1/* $OpenBSD: tls13_handshake.c,v 1.30 2019/02/28 17:39:36 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org> 3 * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org>
4 * Copyright (c) 2019 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2019 Joel Sing <jsing@openbsd.org>
@@ -29,7 +29,6 @@
29#define TLS13_APPLICATION_DATA 2 29#define TLS13_APPLICATION_DATA 2
30 30
31struct tls13_handshake_action { 31struct tls13_handshake_action {
32 uint8_t record_type;
33 uint8_t handshake_type; 32 uint8_t handshake_type;
34 uint8_t sender; 33 uint8_t sender;
35 uint8_t handshake_complete; 34 uint8_t handshake_complete;
@@ -55,42 +54,36 @@ int tls13_handshake_recv_action(struct tls13_ctx *ctx,
55 54
56struct tls13_handshake_action state_machine[] = { 55struct tls13_handshake_action state_machine[] = {
57 [CLIENT_HELLO] = { 56 [CLIENT_HELLO] = {
58 .record_type = TLS13_HANDSHAKE,
59 .handshake_type = TLS13_MT_CLIENT_HELLO, 57 .handshake_type = TLS13_MT_CLIENT_HELLO,
60 .sender = TLS13_HS_CLIENT, 58 .sender = TLS13_HS_CLIENT,
61 .send = tls13_client_hello_send, 59 .send = tls13_client_hello_send,
62 .recv = tls13_client_hello_recv, 60 .recv = tls13_client_hello_recv,
63 }, 61 },
64 [CLIENT_HELLO_RETRY] = { 62 [CLIENT_HELLO_RETRY] = {
65 .record_type = TLS13_HANDSHAKE,
66 .handshake_type = TLS13_MT_CLIENT_HELLO, 63 .handshake_type = TLS13_MT_CLIENT_HELLO,
67 .sender = TLS13_HS_CLIENT, 64 .sender = TLS13_HS_CLIENT,
68 .send = tls13_client_hello_retry_send, 65 .send = tls13_client_hello_retry_send,
69 .recv = tls13_client_hello_retry_recv, 66 .recv = tls13_client_hello_retry_recv,
70 }, 67 },
71 [CLIENT_END_OF_EARLY_DATA] = { 68 [CLIENT_END_OF_EARLY_DATA] = {
72 .record_type = TLS13_HANDSHAKE,
73 .handshake_type = TLS13_MT_END_OF_EARLY_DATA, 69 .handshake_type = TLS13_MT_END_OF_EARLY_DATA,
74 .sender = TLS13_HS_CLIENT, 70 .sender = TLS13_HS_CLIENT,
75 .send = tls13_client_end_of_early_data_send, 71 .send = tls13_client_end_of_early_data_send,
76 .recv = tls13_client_end_of_early_data_recv, 72 .recv = tls13_client_end_of_early_data_recv,
77 }, 73 },
78 [CLIENT_CERTIFICATE] = { 74 [CLIENT_CERTIFICATE] = {
79 .record_type = TLS13_HANDSHAKE,
80 .handshake_type = TLS13_MT_CERTIFICATE, 75 .handshake_type = TLS13_MT_CERTIFICATE,
81 .sender = TLS13_HS_CLIENT, 76 .sender = TLS13_HS_CLIENT,
82 .send = tls13_client_certificate_send, 77 .send = tls13_client_certificate_send,
83 .recv = tls13_client_certificate_recv, 78 .recv = tls13_client_certificate_recv,
84 }, 79 },
85 [CLIENT_CERTIFICATE_VERIFY] = { 80 [CLIENT_CERTIFICATE_VERIFY] = {
86 .record_type = TLS13_HANDSHAKE,
87 .handshake_type = TLS13_MT_CERTIFICATE_VERIFY, 81 .handshake_type = TLS13_MT_CERTIFICATE_VERIFY,
88 .sender = TLS13_HS_CLIENT, 82 .sender = TLS13_HS_CLIENT,
89 .send = tls13_client_certificate_verify_send, 83 .send = tls13_client_certificate_verify_send,
90 .recv = tls13_client_certificate_verify_recv, 84 .recv = tls13_client_certificate_verify_recv,
91 }, 85 },
92 [CLIENT_FINISHED] = { 86 [CLIENT_FINISHED] = {
93 .record_type = TLS13_HANDSHAKE,
94 .handshake_type = TLS13_MT_FINISHED, 87 .handshake_type = TLS13_MT_FINISHED,
95 .sender = TLS13_HS_CLIENT, 88 .sender = TLS13_HS_CLIENT,
96 .send = tls13_client_finished_send, 89 .send = tls13_client_finished_send,
@@ -98,42 +91,36 @@ struct tls13_handshake_action state_machine[] = {
98 .recv = tls13_client_finished_recv, 91 .recv = tls13_client_finished_recv,
99 }, 92 },
100 [CLIENT_KEY_UPDATE] = { 93 [CLIENT_KEY_UPDATE] = {
101 .record_type = TLS13_HANDSHAKE,
102 .handshake_type = TLS13_MT_KEY_UPDATE, 94 .handshake_type = TLS13_MT_KEY_UPDATE,
103 .sender = TLS13_HS_CLIENT, 95 .sender = TLS13_HS_CLIENT,
104 .send = tls13_client_key_update_send, 96 .send = tls13_client_key_update_send,
105 .recv = tls13_client_key_update_recv, 97 .recv = tls13_client_key_update_recv,
106 }, 98 },
107 [SERVER_HELLO] = { 99 [SERVER_HELLO] = {
108 .record_type = TLS13_HANDSHAKE,
109 .handshake_type = TLS13_MT_SERVER_HELLO, 100 .handshake_type = TLS13_MT_SERVER_HELLO,
110 .sender = TLS13_HS_SERVER, 101 .sender = TLS13_HS_SERVER,
111 .send = tls13_server_hello_send, 102 .send = tls13_server_hello_send,
112 .recv = tls13_server_hello_recv, 103 .recv = tls13_server_hello_recv,
113 }, 104 },
114 [SERVER_ENCRYPTED_EXTENSIONS] = { 105 [SERVER_ENCRYPTED_EXTENSIONS] = {
115 .record_type = TLS13_HANDSHAKE,
116 .handshake_type = TLS13_MT_ENCRYPTED_EXTENSIONS, 106 .handshake_type = TLS13_MT_ENCRYPTED_EXTENSIONS,
117 .sender = TLS13_HS_SERVER, 107 .sender = TLS13_HS_SERVER,
118 .send = tls13_server_encrypted_extensions_send, 108 .send = tls13_server_encrypted_extensions_send,
119 .recv = tls13_server_encrypted_extensions_recv, 109 .recv = tls13_server_encrypted_extensions_recv,
120 }, 110 },
121 [SERVER_CERTIFICATE] = { 111 [SERVER_CERTIFICATE] = {
122 .record_type = TLS13_HANDSHAKE,
123 .handshake_type = TLS13_MT_CERTIFICATE, 112 .handshake_type = TLS13_MT_CERTIFICATE,
124 .sender = TLS13_HS_SERVER, 113 .sender = TLS13_HS_SERVER,
125 .send = tls13_server_certificate_send, 114 .send = tls13_server_certificate_send,
126 .recv = tls13_server_certificate_recv, 115 .recv = tls13_server_certificate_recv,
127 }, 116 },
128 [SERVER_CERTIFICATE_REQUEST] = { 117 [SERVER_CERTIFICATE_REQUEST] = {
129 .record_type = TLS13_HANDSHAKE,
130 .handshake_type = TLS13_MT_CERTIFICATE, 118 .handshake_type = TLS13_MT_CERTIFICATE,
131 .sender = TLS13_HS_SERVER, 119 .sender = TLS13_HS_SERVER,
132 .send = tls13_server_certificate_request_send, 120 .send = tls13_server_certificate_request_send,
133 .recv = tls13_server_certificate_request_recv, 121 .recv = tls13_server_certificate_request_recv,
134 }, 122 },
135 [SERVER_CERTIFICATE_VERIFY] = { 123 [SERVER_CERTIFICATE_VERIFY] = {
136 .record_type = TLS13_HANDSHAKE,
137 .handshake_type = TLS13_MT_CERTIFICATE_VERIFY, 124 .handshake_type = TLS13_MT_CERTIFICATE_VERIFY,
138 .sender = TLS13_HS_SERVER, 125 .sender = TLS13_HS_SERVER,
139 .preserve_transcript_hash = 1, 126 .preserve_transcript_hash = 1,
@@ -141,7 +128,6 @@ struct tls13_handshake_action state_machine[] = {
141 .recv = tls13_server_certificate_verify_recv, 128 .recv = tls13_server_certificate_verify_recv,
142 }, 129 },
143 [SERVER_FINISHED] = { 130 [SERVER_FINISHED] = {
144 .record_type = TLS13_HANDSHAKE,
145 .handshake_type = TLS13_MT_FINISHED, 131 .handshake_type = TLS13_MT_FINISHED,
146 .sender = TLS13_HS_SERVER, 132 .sender = TLS13_HS_SERVER,
147 .preserve_transcript_hash = 1, 133 .preserve_transcript_hash = 1,
@@ -149,7 +135,6 @@ struct tls13_handshake_action state_machine[] = {
149 .recv = tls13_server_finished_recv, 135 .recv = tls13_server_finished_recv,
150 }, 136 },
151 [APPLICATION_DATA] = { 137 [APPLICATION_DATA] = {
152 .record_type = TLS13_APPLICATION_DATA,
153 .handshake_complete = 1, 138 .handshake_complete = 1,
154 }, 139 },
155}; 140};