summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2016-12-21 17:18:54 +0000
committerjsing <>2016-12-21 17:18:54 +0000
commit60059a27dada0300e806d8a31bdfedb4c5955137 (patch)
treee317f3f190d3cd337549f51cc91bc487fa1ca4f7
parent21f4c835d65963db82ada357b208e22fec957378 (diff)
downloadopenbsd-60059a27dada0300e806d8a31bdfedb4c5955137.tar.gz
openbsd-60059a27dada0300e806d8a31bdfedb4c5955137.tar.bz2
openbsd-60059a27dada0300e806d8a31bdfedb4c5955137.zip
Update regress for ECDHE with X25519.
-rw-r--r--src/regress/lib/libssl/client/clienttest.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c
index c1997c41d4..b61308d3a9 100644
--- a/src/regress/lib/libssl/client/clienttest.c
+++ b/src/regress/lib/libssl/client/clienttest.c
@@ -72,8 +72,8 @@ static unsigned char cipher_list_tls10[] = {
72}; 72};
73 73
74static unsigned char client_hello_tls10[] = { 74static unsigned char client_hello_tls10[] = {
75 0x16, 0x03, 0x01, 0x00, 0xb5, 0x01, 0x00, 0x00, 75 0x16, 0x03, 0x01, 0x00, 0xb7, 0x01, 0x00, 0x00,
76 0xb1, 0x03, 0x01, 0x06, 0x6a, 0x3f, 0x0f, 0xf5, 76 0xb3, 0x03, 0x01, 0x06, 0x6a, 0x3f, 0x0f, 0xf5,
77 0x19, 0x64, 0x2d, 0xfd, 0xb1, 0x4a, 0x91, 0xcd, 77 0x19, 0x64, 0x2d, 0xfd, 0xb1, 0x4a, 0x91, 0xcd,
78 0x65, 0x37, 0xf8, 0x51, 0x92, 0xf9, 0xbf, 0xe9, 78 0x65, 0x37, 0xf8, 0x51, 0x92, 0xf9, 0xbf, 0xe9,
79 0x46, 0x41, 0x2e, 0x0a, 0x4d, 0xb1, 0xa8, 0x0c, 79 0x46, 0x41, 0x2e, 0x0a, 0x4d, 0xb1, 0xa8, 0x0c,
@@ -85,17 +85,17 @@ static unsigned char client_hello_tls10[] = {
85 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 85 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
86 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 86 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
87 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 87 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12,
88 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x4a, 88 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x4c,
89 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02, 89 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02,
90 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38, 0x00, 0x0e, 90 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d,
91 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c, 0x00, 0x0b, 91 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c,
92 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18, 0x00, 0x09, 92 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
93 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16, 0x00, 0x17, 93 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
94 0x00, 0x08, 0x00, 0x06, 0x00, 0x07, 0x00, 0x14, 94 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
95 0x00, 0x15, 0x00, 0x04, 0x00, 0x05, 0x00, 0x12, 95 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
96 0x00, 0x13, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 96 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
97 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11, 0x00, 0x23, 97 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
98 0x00, 0x00, 98 0x00, 0x23, 0x00, 0x00,
99}; 99};
100 100
101static unsigned char cipher_list_tls11[] = { 101static unsigned char cipher_list_tls11[] = {
@@ -110,8 +110,8 @@ static unsigned char cipher_list_tls11[] = {
110}; 110};
111 111
112static unsigned char client_hello_tls11[] = { 112static unsigned char client_hello_tls11[] = {
113 0x16, 0x03, 0x01, 0x00, 0xb5, 0x01, 0x00, 0x00, 113 0x16, 0x03, 0x01, 0x00, 0xb7, 0x01, 0x00, 0x00,
114 0xb1, 0x03, 0x02, 0x2f, 0x93, 0x9c, 0x37, 0x16, 114 0xb3, 0x03, 0x02, 0x2f, 0x93, 0x9c, 0x37, 0x16,
115 0x88, 0x53, 0xa1, 0xba, 0xb2, 0x36, 0xc9, 0xdf, 115 0x88, 0x53, 0xa1, 0xba, 0xb2, 0x36, 0xc9, 0xdf,
116 0xa4, 0x5f, 0x80, 0x6a, 0x8b, 0xfe, 0x00, 0x52, 116 0xa4, 0x5f, 0x80, 0x6a, 0x8b, 0xfe, 0x00, 0x52,
117 0xd3, 0xd2, 0x68, 0x2a, 0xae, 0xca, 0x72, 0xae, 117 0xd3, 0xd2, 0x68, 0x2a, 0xae, 0xca, 0x72, 0xae,
@@ -123,17 +123,17 @@ static unsigned char client_hello_tls11[] = {
123 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 123 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
124 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 124 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
125 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 125 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12,
126 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x4a, 126 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x4c,
127 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02, 127 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02,
128 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38, 0x00, 0x0e, 128 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d,
129 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c, 0x00, 0x0b, 129 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c,
130 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18, 0x00, 0x09, 130 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
131 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16, 0x00, 0x17, 131 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
132 0x00, 0x08, 0x00, 0x06, 0x00, 0x07, 0x00, 0x14, 132 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
133 0x00, 0x15, 0x00, 0x04, 0x00, 0x05, 0x00, 0x12, 133 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
134 0x00, 0x13, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 134 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
135 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11, 0x00, 0x23, 135 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
136 0x00, 0x00, 136 0x00, 0x23, 0x00, 0x00,
137}; 137};
138 138
139static unsigned char cipher_list_tls12_aes[] = { 139static unsigned char cipher_list_tls12_aes[] = {
@@ -175,8 +175,8 @@ static unsigned char cipher_list_tls12_chacha[] = {
175}; 175};
176 176
177static unsigned char client_hello_tls12[] = { 177static unsigned char client_hello_tls12[] = {
178 0x16, 0x03, 0x01, 0x01, 0x1f, 0x01, 0x00, 0x01, 178 0x16, 0x03, 0x01, 0x01, 0x21, 0x01, 0x00, 0x01,
179 0x1b, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 179 0x1d, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
180 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 180 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
181 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 181 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
182 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 182 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -196,22 +196,22 @@ static unsigned char client_hello_tls12[] = {
196 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 196 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
197 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 197 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
198 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 198 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12,
199 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x74, 199 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x76,
200 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02, 200 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02,
201 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38, 0x00, 0x0e, 201 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d,
202 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c, 0x00, 0x0b, 202 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c,
203 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18, 0x00, 0x09, 203 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
204 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16, 0x00, 0x17, 204 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
205 0x00, 0x08, 0x00, 0x06, 0x00, 0x07, 0x00, 0x14, 205 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
206 0x00, 0x15, 0x00, 0x04, 0x00, 0x05, 0x00, 0x12, 206 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
207 0x00, 0x13, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 207 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
208 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11, 0x00, 0x23, 208 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
209 0x00, 0x00, 0x00, 0x0d, 0x00, 0x26, 0x00, 0x24, 209 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x26,
210 0x06, 0x01, 0x06, 0x02, 0x06, 0x03, 0xef, 0xef, 210 0x00, 0x24, 0x06, 0x01, 0x06, 0x02, 0x06, 0x03,
211 0x05, 0x01, 0x05, 0x02, 0x05, 0x03, 0x04, 0x01, 211 0xef, 0xef, 0x05, 0x01, 0x05, 0x02, 0x05, 0x03,
212 0x04, 0x02, 0x04, 0x03, 0xee, 0xee, 0xed, 0xed, 212 0x04, 0x01, 0x04, 0x02, 0x04, 0x03, 0xee, 0xee,
213 0x03, 0x01, 0x03, 0x02, 0x03, 0x03, 0x02, 0x01, 213 0xed, 0xed, 0x03, 0x01, 0x03, 0x02, 0x03, 0x03,
214 0x02, 0x02, 0x02, 0x03, 214 0x02, 0x01, 0x02, 0x02, 0x02, 0x03,
215}; 215};
216 216
217struct client_hello_test { 217struct client_hello_test {