diff options
author | jsing <> | 2016-04-28 16:41:20 +0000 |
---|---|---|
committer | jsing <> | 2016-04-28 16:41:20 +0000 |
commit | 89acd8206b86ff8f479e0dc051a65e8fec47257c (patch) | |
tree | 4a3b9fc7cb1df4a610ef77a9704eb23671e75409 /src | |
parent | 21309143ef5fb22db3d96c345e9b175fe105c359 (diff) | |
download | openbsd-89acd8206b86ff8f479e0dc051a65e8fec47257c.tar.gz openbsd-89acd8206b86ff8f479e0dc051a65e8fec47257c.tar.bz2 openbsd-89acd8206b86ff8f479e0dc051a65e8fec47257c.zip |
Update regress test to reflect changes in the cipher list.
Diffstat (limited to 'src')
-rw-r--r-- | src/regress/lib/libssl/client/clienttest.c | 123 |
1 files changed, 62 insertions, 61 deletions
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c index 24215f0944..5b556794da 100644 --- a/src/regress/lib/libssl/client/clienttest.c +++ b/src/regress/lib/libssl/client/clienttest.c | |||
@@ -152,55 +152,27 @@ static unsigned char cipher_list_tls12_aes[] = { | |||
152 | 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, | 152 | 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, |
153 | 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0xa3, 0x00, 0x9f, | 153 | 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0xa3, 0x00, 0x9f, |
154 | 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x39, 0x00, 0x38, | 154 | 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x39, 0x00, 0x38, |
155 | 0xcc, 0x14, 0xcc, 0x13, 0xcc, 0x15, 0xff, 0x85, | 155 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xcc, 0x14, |
156 | 0x00, 0xc4, 0x00, 0xc3, 0x00, 0x88, 0x00, 0x87, | 156 | 0xcc, 0x13, 0xcc, 0x15, 0xff, 0x85, 0x00, 0xc4, |
157 | 0x00, 0x81, 0xc0, 0x32, 0xc0, 0x2e, 0xc0, 0x2a, | 157 | 0x00, 0xc3, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, |
158 | 0xc0, 0x26, 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x9d, | 158 | 0xc0, 0x32, 0xc0, 0x2e, 0xc0, 0x2a, 0xc0, 0x26, |
159 | 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, | 159 | 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x9d, 0x00, 0x3d, |
160 | 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, | 160 | 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, |
161 | 0xc0, 0x13, 0xc0, 0x09, 0x00, 0xa2, 0x00, 0x9e, | 161 | 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, |
162 | 0x00, 0x67, 0x00, 0x40, 0x00, 0x33, 0x00, 0x32, | 162 | 0xc0, 0x09, 0x00, 0xa2, 0x00, 0x9e, 0x00, 0x67, |
163 | 0x00, 0xbe, 0x00, 0xbd, 0x00, 0x45, 0x00, 0x44, | 163 | 0x00, 0x40, 0x00, 0x33, 0x00, 0x32, 0x00, 0xbe, |
164 | 0xc0, 0x31, 0xc0, 0x2d, 0xc0, 0x29, 0xc0, 0x25, | 164 | 0x00, 0xbd, 0x00, 0x45, 0x00, 0x44, 0xc0, 0x31, |
165 | 0xc0, 0x0e, 0xc0, 0x04, 0x00, 0x9c, 0x00, 0x3c, | 165 | 0xc0, 0x2d, 0xc0, 0x29, 0xc0, 0x25, 0xc0, 0x0e, |
166 | 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0x00, 0x07, | 166 | 0xc0, 0x04, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, |
167 | 0xc0, 0x11, 0xc0, 0x07, 0xc0, 0x0c, 0xc0, 0x02, | 167 | 0x00, 0xba, 0x00, 0x41, 0x00, 0x07, 0xc0, 0x11, |
168 | 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, | 168 | 0xc0, 0x07, 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05, |
169 | 0x00, 0x16, 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, | 169 | 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, |
170 | 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 0x00, 0x09, | 170 | 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a, |
171 | 0x00, 0xff, | 171 | 0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff, |
172 | }; | 172 | }; |
173 | 173 | ||
174 | static unsigned char cipher_list_tls12_chacha[] = { | 174 | static unsigned char cipher_list_tls12_chacha[] = { |
175 | 0xcc, 0x14, 0xcc, 0x13, 0xcc, 0x15, 0xc0, 0x30, | 175 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xcc, 0x14, |
176 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, | ||
177 | 0xc0, 0x0a, 0x00, 0xa3, 0x00, 0x9f, 0x00, 0x6b, | ||
178 | 0x00, 0x6a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85, | ||
179 | 0x00, 0xc4, 0x00, 0xc3, 0x00, 0x88, 0x00, 0x87, | ||
180 | 0x00, 0x81, 0xc0, 0x32, 0xc0, 0x2e, 0xc0, 0x2a, | ||
181 | 0xc0, 0x26, 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x9d, | ||
182 | 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, | ||
183 | 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, | ||
184 | 0xc0, 0x13, 0xc0, 0x09, 0x00, 0xa2, 0x00, 0x9e, | ||
185 | 0x00, 0x67, 0x00, 0x40, 0x00, 0x33, 0x00, 0x32, | ||
186 | 0x00, 0xbe, 0x00, 0xbd, 0x00, 0x45, 0x00, 0x44, | ||
187 | 0xc0, 0x31, 0xc0, 0x2d, 0xc0, 0x29, 0xc0, 0x25, | ||
188 | 0xc0, 0x0e, 0xc0, 0x04, 0x00, 0x9c, 0x00, 0x3c, | ||
189 | 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0x00, 0x07, | ||
190 | 0xc0, 0x11, 0xc0, 0x07, 0xc0, 0x0c, 0xc0, 0x02, | ||
191 | 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, | ||
192 | 0x00, 0x16, 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, | ||
193 | 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 0x00, 0x09, | ||
194 | 0x00, 0xff, | ||
195 | }; | ||
196 | |||
197 | static unsigned char client_hello_tls12[] = { | ||
198 | 0x16, 0x03, 0x01, 0x01, 0x3b, 0x01, 0x00, 0x01, | ||
199 | 0x37, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
200 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
201 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
202 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
203 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x9a, 0xcc, 0x14, | ||
204 | 0xcc, 0x13, 0xcc, 0x15, 0xc0, 0x30, 0xc0, 0x2c, | 176 | 0xcc, 0x13, 0xcc, 0x15, 0xc0, 0x30, 0xc0, 0x2c, |
205 | 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, | 177 | 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, |
206 | 0x00, 0xa3, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x6a, | 178 | 0x00, 0xa3, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x6a, |
@@ -220,21 +192,50 @@ static unsigned char client_hello_tls12[] = { | |||
220 | 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, | 192 | 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, |
221 | 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a, | 193 | 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a, |
222 | 0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff, | 194 | 0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff, |
223 | 0x01, 0x00, 0x00, 0x74, 0x00, 0x0b, 0x00, 0x04, | 195 | }; |
224 | 0x03, 0x00, 0x01, 0x02, 0x00, 0x0a, 0x00, 0x3a, | 196 | |
225 | 0x00, 0x38, 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, | 197 | static unsigned char client_hello_tls12[] = { |
226 | 0x00, 0x1c, 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, | 198 | 0x16, 0x03, 0x01, 0x01, 0x41, 0x01, 0x00, 0x01, |
227 | 0x00, 0x18, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, | 199 | 0x3d, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, |
228 | 0x00, 0x16, 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, | 200 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
229 | 0x00, 0x07, 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, | 201 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
230 | 0x00, 0x05, 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, | 202 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
231 | 0x00, 0x02, 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, | 203 | 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xcc, 0xa9, |
232 | 0x00, 0x11, 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, | 204 | 0xcc, 0xa8, 0xcc, 0xaa, 0xcc, 0x14, 0xcc, 0x13, |
233 | 0x00, 0x26, 0x00, 0x24, 0x06, 0x01, 0x06, 0x02, | 205 | 0xcc, 0x15, 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, |
234 | 0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x02, | 206 | 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0xa3, |
235 | 0x05, 0x03, 0x04, 0x01, 0x04, 0x02, 0x04, 0x03, | 207 | 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x39, |
236 | 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x02, | 208 | 0x00, 0x38, 0xff, 0x85, 0x00, 0xc4, 0x00, 0xc3, |
237 | 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03, | 209 | 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0xc0, 0x32, |
210 | 0xc0, 0x2e, 0xc0, 0x2a, 0xc0, 0x26, 0xc0, 0x0f, | ||
211 | 0xc0, 0x05, 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, | ||
212 | 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, | ||
213 | 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, | ||
214 | 0x00, 0xa2, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x40, | ||
215 | 0x00, 0x33, 0x00, 0x32, 0x00, 0xbe, 0x00, 0xbd, | ||
216 | 0x00, 0x45, 0x00, 0x44, 0xc0, 0x31, 0xc0, 0x2d, | ||
217 | 0xc0, 0x29, 0xc0, 0x25, 0xc0, 0x0e, 0xc0, 0x04, | ||
218 | 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, | ||
219 | 0x00, 0x41, 0x00, 0x07, 0xc0, 0x11, 0xc0, 0x07, | ||
220 | 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05, 0x00, 0x04, | ||
221 | 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13, | ||
222 | 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a, 0x00, 0x15, | ||
223 | 0x00, 0x12, 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, | ||
224 | 0x00, 0x74, 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, | ||
225 | 0x01, 0x02, 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38, | ||
226 | 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c, | ||
227 | 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18, | ||
228 | 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16, | ||
229 | 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07, | ||
230 | 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05, | ||
231 | 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02, | ||
232 | 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11, | ||
233 | 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x26, | ||
234 | 0x00, 0x24, 0x06, 0x01, 0x06, 0x02, 0x06, 0x03, | ||
235 | 0xef, 0xef, 0x05, 0x01, 0x05, 0x02, 0x05, 0x03, | ||
236 | 0x04, 0x01, 0x04, 0x02, 0x04, 0x03, 0xee, 0xee, | ||
237 | 0xed, 0xed, 0x03, 0x01, 0x03, 0x02, 0x03, 0x03, | ||
238 | 0x02, 0x01, 0x02, 0x02, 0x02, 0x03, | ||
238 | }; | 239 | }; |
239 | 240 | ||
240 | struct client_hello_test { | 241 | struct client_hello_test { |