summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2019-01-23 23:38:44 +0000
committertb <>2019-01-23 23:38:44 +0000
commit2dfdc75689030dab08319b5aed57f5413e4a529c (patch)
tree6f8dfaf50e6f0ae631104032868c4615155b6a35 /src
parent4a91b4654c78d359cb9e0cc479b358b673046f5d (diff)
downloadopenbsd-2dfdc75689030dab08319b5aed57f5413e4a529c.tar.gz
openbsd-2dfdc75689030dab08319b5aed57f5413e4a529c.tar.bz2
openbsd-2dfdc75689030dab08319b5aed57f5413e4a529c.zip
make whitespace inside curlies consistent; sort function prototypes.
Diffstat (limited to '')
-rw-r--r--src/regress/lib/libssl/handshake/handshake_table.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/regress/lib/libssl/handshake/handshake_table.c b/src/regress/lib/libssl/handshake/handshake_table.c
index 9ddd6a5b67..fdd471692f 100644
--- a/src/regress/lib/libssl/handshake/handshake_table.c
+++ b/src/regress/lib/libssl/handshake/handshake_table.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: handshake_table.c,v 1.3 2019/01/23 23:29:56 tb Exp $ */ 1/* $OpenBSD: handshake_table.c,v 1.4 2019/01/23 23:38:44 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> 3 * Copyright (c) 2019 Theo Buehler <tb@openbsd.org>
4 * 4 *
@@ -86,58 +86,58 @@ struct child {
86 86
87static struct child stateinfo[][TLS13_NUM_MESSAGE_TYPES] = { 87static struct child stateinfo[][TLS13_NUM_MESSAGE_TYPES] = {
88 [CLIENT_HELLO] = { 88 [CLIENT_HELLO] = {
89 { SERVER_HELLO, NEGOTIATED, 0, 0 }, 89 {SERVER_HELLO, NEGOTIATED, 0, 0},
90 }, 90 },
91 [SERVER_HELLO] = { 91 [SERVER_HELLO] = {
92 { SERVER_ENCRYPTED_EXTENSIONS, DEFAULT, 0, 0 }, 92 {SERVER_ENCRYPTED_EXTENSIONS, DEFAULT, 0, 0},
93 { CLIENT_HELLO_RETRY, WITH_HRR, 0, 0 }, 93 {CLIENT_HELLO_RETRY, WITH_HRR, 0, 0},
94 }, 94 },
95 [CLIENT_HELLO_RETRY] = { 95 [CLIENT_HELLO_RETRY] = {
96 { SERVER_ENCRYPTED_EXTENSIONS, DEFAULT, 0, 0}, 96 {SERVER_ENCRYPTED_EXTENSIONS, DEFAULT, 0, 0},
97 }, 97 },
98 [SERVER_ENCRYPTED_EXTENSIONS] = { 98 [SERVER_ENCRYPTED_EXTENSIONS] = {
99 { SERVER_CERTIFICATE_REQUEST, DEFAULT, 0, 0}, 99 {SERVER_CERTIFICATE_REQUEST, DEFAULT, 0, 0},
100 { SERVER_CERTIFICATE, WITHOUT_CR, 0, 0}, 100 {SERVER_CERTIFICATE, WITHOUT_CR, 0, 0},
101 { SERVER_FINISHED, WITH_PSK, 0, 0}, 101 {SERVER_FINISHED, WITH_PSK, 0, 0},
102 }, 102 },
103 [SERVER_CERTIFICATE_REQUEST] = { 103 [SERVER_CERTIFICATE_REQUEST] = {
104 { SERVER_CERTIFICATE, DEFAULT, 0, 0}, 104 {SERVER_CERTIFICATE, DEFAULT, 0, 0},
105 }, 105 },
106 [SERVER_CERTIFICATE] = { 106 [SERVER_CERTIFICATE] = {
107 { SERVER_CERTIFICATE_VERIFY, DEFAULT, 0, 0}, 107 {SERVER_CERTIFICATE_VERIFY, DEFAULT, 0, 0},
108 }, 108 },
109 [SERVER_CERTIFICATE_VERIFY] = { 109 [SERVER_CERTIFICATE_VERIFY] = {
110 { SERVER_FINISHED, DEFAULT, 0, 0}, 110 {SERVER_FINISHED, DEFAULT, 0, 0},
111 }, 111 },
112 [SERVER_FINISHED] = { 112 [SERVER_FINISHED] = {
113 { CLIENT_FINISHED, DEFAULT, WITHOUT_CR | WITH_PSK, 0 }, 113 {CLIENT_FINISHED, DEFAULT, WITHOUT_CR | WITH_PSK, 0},
114 { CLIENT_CERTIFICATE, DEFAULT, 0, WITHOUT_CR | WITH_PSK }, 114 {CLIENT_CERTIFICATE, DEFAULT, 0, WITHOUT_CR | WITH_PSK},
115 /* { CLIENT_END_OF_EARLY_DATA, WITH_0RTT, 0, 0}, */ 115 /* {CLIENT_END_OF_EARLY_DATA, WITH_0RTT, 0, 0}, */
116 }, 116 },
117 [CLIENT_CERTIFICATE] = { 117 [CLIENT_CERTIFICATE] = {
118 { CLIENT_FINISHED, DEFAULT, 0, 0}, 118 {CLIENT_FINISHED, DEFAULT, 0, 0},
119 { CLIENT_CERTIFICATE_VERIFY, WITH_CCV, 0, 0}, 119 {CLIENT_CERTIFICATE_VERIFY, WITH_CCV, 0, 0},
120 }, 120 },
121 [CLIENT_CERTIFICATE_VERIFY] = { 121 [CLIENT_CERTIFICATE_VERIFY] = {
122 { CLIENT_FINISHED, DEFAULT, 0, 0}, 122 {CLIENT_FINISHED, DEFAULT, 0, 0},
123 }, 123 },
124 [CLIENT_FINISHED] = { 124 [CLIENT_FINISHED] = {
125 { APPLICATION_DATA, DEFAULT, 0, 0}, 125 {APPLICATION_DATA, DEFAULT, 0, 0},
126 }, 126 },
127 [APPLICATION_DATA] = { 127 [APPLICATION_DATA] = {
128 { 0, DEFAULT, 0, 0}, 128 {0, DEFAULT, 0, 0},
129 }, 129 },
130}; 130};
131 131
132size_t count_handshakes(void);
133const char *flag2str(uint8_t flag);
134void print_flags(uint8_t flags);
135const char *mt2str(enum tls13_message_type mt);
136void build_table(enum tls13_message_type 132void build_table(enum tls13_message_type
137 table[UINT8_MAX][TLS13_NUM_MESSAGE_TYPES], struct child current, 133 table[UINT8_MAX][TLS13_NUM_MESSAGE_TYPES], struct child current,
138 struct child end, struct child path[], uint8_t flags, unsigned int depth); 134 struct child end, struct child path[], uint8_t flags, unsigned int depth);
135size_t count_handshakes(void);
136const char *flag2str(uint8_t flag);
137const char *mt2str(enum tls13_message_type mt);
139void print_entry(enum tls13_message_type path[TLS13_NUM_MESSAGE_TYPES], 138void print_entry(enum tls13_message_type path[TLS13_NUM_MESSAGE_TYPES],
140 uint8_t flags); 139 uint8_t flags);
140void print_flags(uint8_t flags);
141__dead void usage(void); 141__dead void usage(void);
142int verify_table(enum tls13_message_type 142int verify_table(enum tls13_message_type
143 table[UINT8_MAX][TLS13_NUM_MESSAGE_TYPES], int print); 143 table[UINT8_MAX][TLS13_NUM_MESSAGE_TYPES], int print);
@@ -397,7 +397,7 @@ main(int argc, char *argv[])
397 struct child end = { 397 struct child end = {
398 APPLICATION_DATA, DEFAULT, 0, 0, 398 APPLICATION_DATA, DEFAULT, 0, 0,
399 }; 399 };
400 struct child path[TLS13_NUM_MESSAGE_TYPES] = {{ 0 }}; 400 struct child path[TLS13_NUM_MESSAGE_TYPES] = {{0}};
401 uint8_t flags = 0; 401 uint8_t flags = 0;
402 unsigned int depth = 0; 402 unsigned int depth = 0;
403 int ch, print = 0; 403 int ch, print = 0;