diff options
| author | jsing <> | 2020-04-22 17:05:53 +0000 |
|---|---|---|
| committer | jsing <> | 2020-04-22 17:05:53 +0000 |
| commit | 5c3c8eda11f93b895016558ebf69ea123c0dce89 (patch) | |
| tree | d0265572699906ddee08aa6578a32f3cd1fa0204 /src/regress | |
| parent | c18a60d45888295bb8cf344e076d84ef817a65a5 (diff) | |
| download | openbsd-5c3c8eda11f93b895016558ebf69ea123c0dce89.tar.gz openbsd-5c3c8eda11f93b895016558ebf69ea123c0dce89.tar.bz2 openbsd-5c3c8eda11f93b895016558ebf69ea123c0dce89.zip | |
Revise regress to match state transition changes.
Diffstat (limited to 'src/regress')
| -rw-r--r-- | src/regress/lib/libssl/handshake/handshake_table.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/regress/lib/libssl/handshake/handshake_table.c b/src/regress/lib/libssl/handshake/handshake_table.c index 40c9b944a8..a8c68970db 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.12 2020/03/10 17:15:37 jsing Exp $ */ | 1 | /* $OpenBSD: handshake_table.c,v 1.13 2020/04/22 17:05:53 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> |
| 4 | * | 4 | * |
| @@ -86,16 +86,16 @@ struct child { | |||
| 86 | 86 | ||
| 87 | static struct child stateinfo[][TLS13_NUM_MESSAGE_TYPES] = { | 87 | static struct child stateinfo[][TLS13_NUM_MESSAGE_TYPES] = { |
| 88 | [CLIENT_HELLO] = { | 88 | [CLIENT_HELLO] = { |
| 89 | {SERVER_HELLO, DEFAULT, 0, 0}, | 89 | {SERVER_HELLO_RETRY_REQUEST, DEFAULT, 0, 0}, |
| 90 | {SERVER_HELLO, WITHOUT_HRR, 0, 0}, | ||
| 90 | }, | 91 | }, |
| 91 | [SERVER_HELLO] = { | 92 | [SERVER_HELLO_RETRY_REQUEST] = { |
| 92 | {SERVER_ENCRYPTED_EXTENSIONS, DEFAULT, 0, 0}, | 93 | {CLIENT_HELLO_RETRY, DEFAULT, 0, 0}, |
| 93 | {CLIENT_HELLO_RETRY, WITH_HRR, 0, 0}, | ||
| 94 | }, | 94 | }, |
| 95 | [CLIENT_HELLO_RETRY] = { | 95 | [CLIENT_HELLO_RETRY] = { |
| 96 | {SERVER_HELLO_RETRY, DEFAULT, 0, 0}, | 96 | {SERVER_HELLO, DEFAULT, 0, 0}, |
| 97 | }, | 97 | }, |
| 98 | [SERVER_HELLO_RETRY] = { | 98 | [SERVER_HELLO] = { |
| 99 | {SERVER_ENCRYPTED_EXTENSIONS, DEFAULT, 0, 0}, | 99 | {SERVER_ENCRYPTED_EXTENSIONS, DEFAULT, 0, 0}, |
| 100 | }, | 100 | }, |
| 101 | [SERVER_ENCRYPTED_EXTENSIONS] = { | 101 | [SERVER_ENCRYPTED_EXTENSIONS] = { |
| @@ -172,8 +172,8 @@ flag2str(uint8_t flag) | |||
| 172 | case WITHOUT_CR: | 172 | case WITHOUT_CR: |
| 173 | ret = "WITHOUT_CR"; | 173 | ret = "WITHOUT_CR"; |
| 174 | break; | 174 | break; |
| 175 | case WITH_HRR: | 175 | case WITHOUT_HRR: |
| 176 | ret = "WITH_HRR"; | 176 | ret = "WITHOUT_HRR"; |
| 177 | break; | 177 | break; |
| 178 | case WITH_PSK: | 178 | case WITH_PSK: |
| 179 | ret = "WITH_PSK"; | 179 | ret = "WITH_PSK"; |
| @@ -221,8 +221,8 @@ mt2str(enum tls13_message_type mt) | |||
| 221 | case SERVER_HELLO: | 221 | case SERVER_HELLO: |
| 222 | ret = "SERVER_HELLO"; | 222 | ret = "SERVER_HELLO"; |
| 223 | break; | 223 | break; |
| 224 | case SERVER_HELLO_RETRY: | 224 | case SERVER_HELLO_RETRY_REQUEST: |
| 225 | ret = "SERVER_HELLO_RETRY"; | 225 | ret = "SERVER_HELLO_RETRY_REQUEST"; |
| 226 | break; | 226 | break; |
| 227 | case SERVER_ENCRYPTED_EXTENSIONS: | 227 | case SERVER_ENCRYPTED_EXTENSIONS: |
| 228 | ret = "SERVER_ENCRYPTED_EXTENSIONS"; | 228 | ret = "SERVER_ENCRYPTED_EXTENSIONS"; |
| @@ -461,6 +461,8 @@ main(int argc, char *argv[]) | |||
| 461 | hs_table[UINT8_MAX][TLS13_NUM_MESSAGE_TYPES] = { | 461 | hs_table[UINT8_MAX][TLS13_NUM_MESSAGE_TYPES] = { |
| 462 | [INITIAL] = { | 462 | [INITIAL] = { |
| 463 | CLIENT_HELLO, | 463 | CLIENT_HELLO, |
| 464 | SERVER_HELLO_RETRY_REQUEST, | ||
| 465 | CLIENT_HELLO_RETRY, | ||
| 464 | SERVER_HELLO, | 466 | SERVER_HELLO, |
| 465 | }, | 467 | }, |
| 466 | }; | 468 | }; |