diff options
| author | beck <> | 2024-02-03 15:58:34 +0000 |
|---|---|---|
| committer | beck <> | 2024-02-03 15:58:34 +0000 |
| commit | 20afa90e552d2efed2187dbafc92170a3895e921 (patch) | |
| tree | dc1f0834366a35df8a6de61e2722798629d7c4c2 /src/regress/lib/libssl/client | |
| parent | 596318a93b385d8ceac9fe58bdc42976e748c110 (diff) | |
| download | openbsd-20afa90e552d2efed2187dbafc92170a3895e921.tar.gz openbsd-20afa90e552d2efed2187dbafc92170a3895e921.tar.bz2 openbsd-20afa90e552d2efed2187dbafc92170a3895e921.zip | |
Remove GOST and STREEBOG support from libssl.
This version of GOST is old and not anywhere close to compliant with
modern GOST standards. It is also very intrusive in libssl and
makes a mess everywhere. Efforts to entice a suitably minded anyone
to care about it have been unsuccessful.
At this point it is probably best to remove this, and if someone
ever showed up who truly needed a working version, it should be
a clean implementation from scratch, and have it use something
closer to the typical API in libcrypto so it would integrate less
painfully here.
This removes it from libssl in preparation for it's removal from
libcrypto with a future major bump
ok tb@
Diffstat (limited to 'src/regress/lib/libssl/client')
| -rw-r--r-- | src/regress/lib/libssl/client/clienttest.c | 226 |
1 files changed, 110 insertions, 116 deletions
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c index 8fb5a1da7f..18cf2d0c95 100644 --- a/src/regress/lib/libssl/client/clienttest.c +++ b/src/regress/lib/libssl/client/clienttest.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: clienttest.c,v 1.42 2023/07/11 17:03:44 tb Exp $ */ | 1 | /* $OpenBSD: clienttest.c,v 1.43 2024/02/03 15:58:34 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -36,7 +36,7 @@ | |||
| 36 | #define TLS13_RANDOM_OFFSET (TLS13_HM_OFFSET + 2) | 36 | #define TLS13_RANDOM_OFFSET (TLS13_HM_OFFSET + 2) |
| 37 | #define TLS13_SESSION_OFFSET (TLS13_HM_OFFSET + 34) | 37 | #define TLS13_SESSION_OFFSET (TLS13_HM_OFFSET + 34) |
| 38 | #define TLS13_CIPHER_OFFSET (TLS13_HM_OFFSET + 69) | 38 | #define TLS13_CIPHER_OFFSET (TLS13_HM_OFFSET + 69) |
| 39 | #define TLS13_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 188) | 39 | #define TLS13_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 184) |
| 40 | #define TLS13_ONLY_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 98) | 40 | #define TLS13_ONLY_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 98) |
| 41 | 41 | ||
| 42 | #define TLS1_3_VERSION_ONLY (TLS1_3_VERSION | 0x10000) | 42 | #define TLS1_3_VERSION_ONLY (TLS1_3_VERSION | 0x10000) |
| @@ -75,57 +75,54 @@ static const uint8_t cipher_list_dtls12_aes[] = { | |||
| 75 | 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, | 75 | 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, |
| 76 | 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, | 76 | 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, |
| 77 | 0x00, 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, | 77 | 0x00, 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, |
| 78 | 0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, | 78 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, |
| 79 | 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, | 79 | 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, |
| 80 | 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, | 80 | 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, |
| 81 | 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, | 81 | 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, |
| 82 | 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, | 82 | 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, |
| 83 | 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, | 83 | 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x12, |
| 84 | 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, | 84 | 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, |
| 85 | 0x00, 0x0a, 0x00, 0xff | ||
| 86 | }; | 85 | }; |
| 87 | 86 | ||
| 88 | static const uint8_t cipher_list_dtls12_chacha[] = { | 87 | static const uint8_t cipher_list_dtls12_chacha[] = { |
| 89 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, | 88 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, |
| 90 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, | 89 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, |
| 91 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, | 90 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, |
| 92 | 0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, | 91 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, |
| 93 | 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, | 92 | 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, |
| 94 | 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, | 93 | 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, |
| 95 | 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, | 94 | 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, |
| 96 | 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, | 95 | 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, |
| 97 | 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, | 96 | 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x12, |
| 98 | 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, | 97 | 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, |
| 99 | 0x00, 0x0a, 0x00, 0xff, | ||
| 100 | }; | 98 | }; |
| 101 | 99 | ||
| 102 | static const uint8_t client_hello_dtls12[] = { | 100 | static const uint8_t client_hello_dtls12[] = { |
| 103 | 0x16, 0xfe, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, | 101 | 0x16, 0xfe, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 104 | 0x00, 0x00, 0x00, 0x00, 0xbe, 0x01, 0x00, 0x00, | 102 | 0x00, 0x00, 0x00, 0x00, 0xba, 0x01, 0x00, 0x00, |
| 105 | 0xb2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 103 | 0xae, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 106 | 0xb2, 0xfe, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, | 104 | 0xae, 0xfe, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 107 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 105 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 108 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 106 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 109 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 107 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 110 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0xc0, | 108 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xc0, |
| 111 | 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, | 109 | 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, |
| 112 | 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, | 110 | 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, |
| 113 | 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xff, | 111 | 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0x00, |
| 114 | 0x85, 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, | 112 | 0xc4, 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, 0x00, |
| 115 | 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, | 113 | 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, 0xc0, |
| 116 | 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, | 114 | 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, 0xc0, |
| 117 | 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, 0x00, | 115 | 0x09, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, 0x00, |
| 118 | 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, 0x00, | 116 | 0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00, |
| 119 | 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, | 117 | 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x12, 0xc0, |
| 120 | 0x41, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, | 118 | 0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, 0x01, |
| 121 | 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x34, 0x00, | 119 | 0x00, 0x00, 0x34, 0x00, 0x0b, 0x00, 0x02, 0x01, |
| 122 | 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a, 0x00, | 120 | 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00, |
| 123 | 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00, 0x17, 0x00, | 121 | 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, |
| 124 | 0x18, 0x00, 0x19, 0x00, 0x23, 0x00, 0x00, 0x00, | 122 | 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x18, 0x00, |
| 125 | 0x0d, 0x00, 0x18, 0x00, 0x16, 0x08, 0x06, 0x06, | 123 | 0x16, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, 0x08, |
| 126 | 0x01, 0x06, 0x03, 0x08, 0x05, 0x05, 0x01, 0x05, | 124 | 0x05, 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, 0x04, |
| 127 | 0x03, 0x08, 0x04, 0x04, 0x01, 0x04, 0x03, 0x02, | 125 | 0x01, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, |
| 128 | 0x01, 0x02, 0x03, | ||
| 129 | }; | 126 | }; |
| 130 | 127 | ||
| 131 | static const uint8_t cipher_list_tls10[] = { | 128 | static const uint8_t cipher_list_tls10[] = { |
| @@ -186,92 +183,90 @@ static const uint8_t cipher_list_tls12_aes[] = { | |||
| 186 | 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, | 183 | 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, |
| 187 | 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, | 184 | 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, |
| 188 | 0x00, 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, | 185 | 0x00, 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, |
| 189 | 0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, | 186 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, |
| 190 | 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, | 187 | 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, |
| 191 | 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, | 188 | 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, |
| 192 | 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, | 189 | 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, |
| 193 | 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, | 190 | 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, |
| 194 | 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, | 191 | 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, |
| 195 | 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, | 192 | 0xc0, 0x07, 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, |
| 196 | 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, | 193 | 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, |
| 197 | 0x00, 0xff, | ||
| 198 | }; | 194 | }; |
| 199 | 195 | ||
| 200 | static const uint8_t cipher_list_tls12_chacha[] = { | 196 | static const uint8_t cipher_list_tls12_chacha[] = { |
| 201 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, | 197 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, |
| 202 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, | 198 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, |
| 203 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, | 199 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, |
| 204 | 0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, | 200 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, |
| 205 | 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, | 201 | 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, |
| 206 | 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, | 202 | 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, |
| 207 | 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, | 203 | 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, |
| 208 | 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, | 204 | 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, |
| 209 | 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, | 205 | 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, |
| 210 | 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, | 206 | 0xc0, 0x07, 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, |
| 211 | 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, | 207 | 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, |
| 212 | 0x00, 0xff, | ||
| 213 | }; | 208 | }; |
| 214 | 209 | ||
| 215 | static const uint8_t client_hello_tls12[] = { | 210 | static const uint8_t client_hello_tls12[] = { |
| 216 | 0x16, 0x03, 0x03, 0x00, 0xbb, 0x01, 0x00, 0x00, | 211 | 0x16, 0x03, 0x03, 0x00, 0xb7, 0x01, 0x00, 0x00, |
| 217 | 0xb7, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, | 212 | 0xb3, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 218 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 213 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 219 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 214 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 220 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 215 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 221 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0xc0, 0x30, | 216 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0xc0, 0x30, |
| 222 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, | 217 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, |
| 223 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, | 218 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, |
| 224 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xff, 0x85, | 219 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0x00, 0xc4, |
| 225 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d, | 220 | 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, |
| 226 | 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, | 221 | 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, |
| 227 | 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, | 222 | 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, |
| 228 | 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, | 223 | 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, |
| 229 | 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, | 224 | 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, |
| 230 | 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, | 225 | 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, |
| 231 | 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0xc0, 0x12, | 226 | 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, |
| 232 | 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, | 227 | 0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x34, |
| 233 | 0x01, 0x00, 0x00, 0x34, 0x00, 0x0b, 0x00, 0x02, | 228 | 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a, |
| 234 | 0x01, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, | 229 | 0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00, 0x17, |
| 235 | 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, | 230 | 0x00, 0x18, 0x00, 0x19, 0x00, 0x23, 0x00, 0x00, |
| 236 | 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x18, | 231 | 0x00, 0x0d, 0x00, 0x18, 0x00, 0x16, 0x08, 0x06, |
| 237 | 0x00, 0x16, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, | 232 | 0x06, 0x01, 0x06, 0x03, 0x08, 0x05, 0x05, 0x01, |
| 238 | 0x08, 0x05, 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, | 233 | 0x05, 0x03, 0x08, 0x04, 0x04, 0x01, 0x04, 0x03, |
| 239 | 0x04, 0x01, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, | 234 | 0x02, 0x01, 0x02, 0x03, |
| 240 | }; | 235 | }; |
| 241 | 236 | ||
| 242 | static const uint8_t cipher_list_tls13_aes[] = { | 237 | static const uint8_t cipher_list_tls13_aes[] = { |
| 243 | 0x13, 0x02, 0x13, 0x03, 0x13, 0x01, 0xc0, 0x30, | 238 | 0x13, 0x02, 0x13, 0x03, 0x13, 0x01, 0xc0, 0x30, |
| 244 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, | 239 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, |
| 245 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, | 240 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, |
| 246 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xff, 0x85, | 241 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0x00, 0xc4, |
| 247 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d, | 242 | 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, |
| 248 | 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, | 243 | 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, |
| 249 | 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, | 244 | 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, |
| 250 | 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, | 245 | 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, |
| 251 | 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, | 246 | 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, |
| 252 | 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, | 247 | 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, |
| 253 | 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0xc0, 0x12, | 248 | 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, |
| 254 | 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, | 249 | 0x00, 0x0a, 0x00, 0xff, |
| 255 | }; | 250 | }; |
| 256 | 251 | ||
| 257 | static const uint8_t cipher_list_tls13_chacha[] = { | 252 | static const uint8_t cipher_list_tls13_chacha[] = { |
| 258 | 0x13, 0x03, 0x13, 0x02, 0x13, 0x01, 0xcc, 0xa9, | 253 | 0x13, 0x03, 0x13, 0x02, 0x13, 0x01, 0xcc, 0xa9, |
| 259 | 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c, | 254 | 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c, |
| 260 | 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, | 255 | 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, |
| 261 | 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85, | 256 | 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0x00, 0xc4, |
| 262 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d, | 257 | 0x00, 0x88, 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, |
| 263 | 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, | 258 | 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, |
| 264 | 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, | 259 | 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, |
| 265 | 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, | 260 | 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, |
| 266 | 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, | 261 | 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, |
| 267 | 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, | 262 | 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, |
| 268 | 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0xc0, 0x12, | 263 | 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, |
| 269 | 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, | 264 | 0x00, 0x0a, 0x00, 0xff, |
| 270 | }; | 265 | }; |
| 271 | 266 | ||
| 272 | static const uint8_t client_hello_tls13[] = { | 267 | static const uint8_t client_hello_tls13[] = { |
| 273 | 0x16, 0x03, 0x03, 0x01, 0x14, 0x01, 0x00, 0x01, | 268 | 0x16, 0x03, 0x03, 0x01, 0x10, 0x01, 0x00, 0x01, |
| 274 | 0x10, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, | 269 | 0x0c, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 275 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 270 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 276 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 271 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 277 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 272 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| @@ -279,33 +274,32 @@ static const uint8_t client_hello_tls13[] = { | |||
| 279 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 274 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 280 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 275 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 281 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 276 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 282 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x13, 0x03, | 277 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x13, 0x03, |
| 283 | 0x13, 0x02, 0x13, 0x01, 0xcc, 0xa9, 0xcc, 0xa8, | 278 | 0x13, 0x02, 0x13, 0x01, 0xcc, 0xa9, 0xcc, 0xa8, |
| 284 | 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, | 279 | 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, |
| 285 | 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, | 280 | 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, |
| 286 | 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85, 0x00, 0xc4, | 281 | 0x00, 0x6b, 0x00, 0x39, 0x00, 0xc4, 0x00, 0x88, |
| 287 | 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d, 0x00, 0x3d, | 282 | 0x00, 0x81, 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, |
| 288 | 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, | 283 | 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, |
| 289 | 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, | 284 | 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, |
| 290 | 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, | 285 | 0x00, 0x9e, 0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, |
| 291 | 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, | 286 | 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, |
| 292 | 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, | 287 | 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, |
| 293 | 0xc0, 0x07, 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, | 288 | 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, |
| 294 | 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, | 289 | 0x00, 0x0a, 0x01, 0x00, 0x00, 0x67, 0x00, 0x2b, |
| 295 | 0x00, 0x67, 0x00, 0x2b, 0x00, 0x05, 0x04, 0x03, | 290 | 0x00, 0x05, 0x04, 0x03, 0x04, 0x03, 0x03, 0x00, |
| 296 | 0x04, 0x03, 0x03, 0x00, 0x33, 0x00, 0x26, 0x00, | 291 | 0x33, 0x00, 0x26, 0x00, 0x24, 0x00, 0x1d, 0x00, |
| 297 | 0x24, 0x00, 0x1d, 0x00, 0x20, 0x00, 0x00, 0x00, | 292 | 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 298 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 293 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 299 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 294 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 300 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 295 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 301 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, | 296 | 0x00, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, |
| 302 | 0x02, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, | 297 | 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00, |
| 303 | 0x08, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, | 298 | 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x23, 0x00, |
| 304 | 0x19, 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, | 299 | 0x00, 0x00, 0x0d, 0x00, 0x18, 0x00, 0x16, 0x08, |
| 305 | 0x18, 0x00, 0x16, 0x08, 0x06, 0x06, 0x01, 0x06, | 300 | 0x06, 0x06, 0x01, 0x06, 0x03, 0x08, 0x05, 0x05, |
| 306 | 0x03, 0x08, 0x05, 0x05, 0x01, 0x05, 0x03, 0x08, | 301 | 0x01, 0x05, 0x03, 0x08, 0x04, 0x04, 0x01, 0x04, |
| 307 | 0x04, 0x04, 0x01, 0x04, 0x03, 0x02, 0x01, 0x02, | 302 | 0x03, 0x02, 0x01, 0x02, 0x03, |
| 308 | 0x03, | ||
| 309 | }; | 303 | }; |
| 310 | 304 | ||
| 311 | static const uint8_t cipher_list_tls13_only_aes[] = { | 305 | static const uint8_t cipher_list_tls13_only_aes[] = { |
