summaryrefslogtreecommitdiff
path: root/regress/lib
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2016-10-19 16:39:56 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2016-10-19 16:39:56 +0000
commit80bc0c22954633b5447e4a350b89b5bdba40e1df (patch)
treeef9921ec544f231f61dad456e096c147788bf0b8 /regress/lib
parentbf84ec03d231d466263eee1791f7aaa324299c02 (diff)
Update client hello messages to follow the removal of fixed ECDH.
Diffstat (limited to 'regress/lib')
-rw-r--r--regress/lib/libssl/client/clienttest.c154
1 files changed, 65 insertions, 89 deletions
diff --git a/regress/lib/libssl/client/clienttest.c b/regress/lib/libssl/client/clienttest.c
index 5b556794da5..cc6523184b8 100644
--- a/regress/lib/libssl/client/clienttest.c
+++ b/regress/lib/libssl/client/clienttest.c
@@ -34,65 +34,57 @@
static unsigned char cipher_list_dtls1[] = {
0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38,
0xff, 0x85, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81,
- 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x35, 0x00, 0x84,
- 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x32,
- 0x00, 0x45, 0x00, 0x44, 0xc0, 0x0e, 0xc0, 0x04,
+ 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09,
+ 0x00, 0x33, 0x00, 0x32, 0x00, 0x45, 0x00, 0x44,
0x00, 0x2f, 0x00, 0x41, 0x00, 0x07, 0xc0, 0x12,
- 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13, 0xc0, 0x0d,
- 0xc0, 0x03, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12,
- 0x00, 0x09, 0x00, 0xff,
+ 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a,
+ 0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff,
};
static unsigned char client_hello_dtls1[] = {
0x16, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x7e, 0x01, 0x00, 0x00,
- 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x72, 0xfe, 0xff, 0xc3, 0xd6, 0x19, 0xf8, 0x5d,
+ 0x00, 0x00, 0x00, 0x00, 0x72, 0x01, 0x00, 0x00,
+ 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x66, 0xfe, 0xff, 0xc3, 0xd6, 0x19, 0xf8, 0x5d,
0x6a, 0xe3, 0x6d, 0x16, 0x4a, 0xf7, 0x8f, 0x8e,
0x4a, 0x12, 0x87, 0xcf, 0x07, 0x99, 0xa7, 0x92,
0x40, 0xbd, 0x06, 0x9f, 0xe9, 0xd2, 0x68, 0x84,
- 0xff, 0x6f, 0xe8, 0x00, 0x00, 0x00, 0x44, 0xc0,
+ 0xff, 0x6f, 0xe8, 0x00, 0x00, 0x00, 0x38, 0xc0,
0x14, 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff,
- 0x85, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0xc0,
- 0x0f, 0xc0, 0x05, 0x00, 0x35, 0x00, 0x84, 0xc0,
- 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x32, 0x00,
- 0x45, 0x00, 0x44, 0xc0, 0x0e, 0xc0, 0x04, 0x00,
+ 0x85, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00,
+ 0x35, 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00,
+ 0x33, 0x00, 0x32, 0x00, 0x45, 0x00, 0x44, 0x00,
0x2f, 0x00, 0x41, 0x00, 0x07, 0xc0, 0x12, 0xc0,
- 0x08, 0x00, 0x16, 0x00, 0x13, 0xc0, 0x0d, 0xc0,
- 0x03, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 0x00,
- 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x04, 0x00,
- 0x23, 0x00, 0x00,
+ 0x08, 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a, 0x00,
+ 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff, 0x01,
+ 0x00, 0x00, 0x04, 0x00, 0x23, 0x00, 0x00,
};
static unsigned char cipher_list_tls10[] = {
0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38,
0xff, 0x85, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81,
- 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x35, 0x00, 0x84,
- 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x32,
- 0x00, 0x45, 0x00, 0x44, 0xc0, 0x0e, 0xc0, 0x04,
+ 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09,
+ 0x00, 0x33, 0x00, 0x32, 0x00, 0x45, 0x00, 0x44,
0x00, 0x2f, 0x00, 0x41, 0x00, 0x07, 0xc0, 0x11,
- 0xc0, 0x07, 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05,
- 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
- 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a,
+ 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12,
+ 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a,
0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff,
};
static unsigned char client_hello_tls10[] = {
- 0x16, 0x03, 0x01, 0x00, 0xc7, 0x01, 0x00, 0x00,
- 0xc3, 0x03, 0x01, 0x06, 0x6a, 0x3f, 0x0f, 0xf5,
+ 0x16, 0x03, 0x01, 0x00, 0xb7, 0x01, 0x00, 0x00,
+ 0xb3, 0x03, 0x01, 0x06, 0x6a, 0x3f, 0x0f, 0xf5,
0x19, 0x64, 0x2d, 0xfd, 0xb1, 0x4a, 0x91, 0xcd,
0x65, 0x37, 0xf8, 0x51, 0x92, 0xf9, 0xbf, 0xe9,
0x46, 0x41, 0x2e, 0x0a, 0x4d, 0xb1, 0xa8, 0x0c,
- 0x88, 0xec, 0x03, 0x00, 0x00, 0x50, 0xc0, 0x14,
+ 0x88, 0xec, 0x03, 0x00, 0x00, 0x40, 0xc0, 0x14,
0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85,
- 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0xc0, 0x0f,
- 0xc0, 0x05, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
- 0xc0, 0x09, 0x00, 0x33, 0x00, 0x32, 0x00, 0x45,
- 0x00, 0x44, 0xc0, 0x0e, 0xc0, 0x04, 0x00, 0x2f,
+ 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35,
+ 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33,
+ 0x00, 0x32, 0x00, 0x45, 0x00, 0x44, 0x00, 0x2f,
0x00, 0x41, 0x00, 0x07, 0xc0, 0x11, 0xc0, 0x07,
- 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05, 0x00, 0x04,
- 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13,
- 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a, 0x00, 0x15,
+ 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
+ 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15,
0x00, 0x12, 0x00, 0x09, 0x00, 0xff, 0x01, 0x00,
0x00, 0x4a, 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00,
0x01, 0x02, 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38,
@@ -109,32 +101,28 @@ static unsigned char client_hello_tls10[] = {
static unsigned char cipher_list_tls11[] = {
0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38,
0xff, 0x85, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81,
- 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x35, 0x00, 0x84,
- 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x32,
- 0x00, 0x45, 0x00, 0x44, 0xc0, 0x0e, 0xc0, 0x04,
+ 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09,
+ 0x00, 0x33, 0x00, 0x32, 0x00, 0x45, 0x00, 0x44,
0x00, 0x2f, 0x00, 0x41, 0x00, 0x07, 0xc0, 0x11,
- 0xc0, 0x07, 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05,
- 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
- 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a,
+ 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12,
+ 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a,
0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff,
};
static unsigned char client_hello_tls11[] = {
- 0x16, 0x03, 0x01, 0x00, 0xc7, 0x01, 0x00, 0x00,
- 0xc3, 0x03, 0x02, 0x2f, 0x93, 0x9c, 0x37, 0x16,
+ 0x16, 0x03, 0x01, 0x00, 0xb7, 0x01, 0x00, 0x00,
+ 0xb3, 0x03, 0x02, 0x2f, 0x93, 0x9c, 0x37, 0x16,
0x88, 0x53, 0xa1, 0xba, 0xb2, 0x36, 0xc9, 0xdf,
0xa4, 0x5f, 0x80, 0x6a, 0x8b, 0xfe, 0x00, 0x52,
0xd3, 0xd2, 0x68, 0x2a, 0xae, 0xca, 0x72, 0xae,
- 0x70, 0x77, 0x84, 0x00, 0x00, 0x50, 0xc0, 0x14,
+ 0x70, 0x77, 0x84, 0x00, 0x00, 0x40, 0xc0, 0x14,
0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85,
- 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0xc0, 0x0f,
- 0xc0, 0x05, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
- 0xc0, 0x09, 0x00, 0x33, 0x00, 0x32, 0x00, 0x45,
- 0x00, 0x44, 0xc0, 0x0e, 0xc0, 0x04, 0x00, 0x2f,
+ 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35,
+ 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33,
+ 0x00, 0x32, 0x00, 0x45, 0x00, 0x44, 0x00, 0x2f,
0x00, 0x41, 0x00, 0x07, 0xc0, 0x11, 0xc0, 0x07,
- 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05, 0x00, 0x04,
- 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13,
- 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a, 0x00, 0x15,
+ 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
+ 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15,
0x00, 0x12, 0x00, 0x09, 0x00, 0xff, 0x01, 0x00,
0x00, 0x4a, 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00,
0x01, 0x02, 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38,
@@ -155,19 +143,15 @@ static unsigned char cipher_list_tls12_aes[] = {
0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xcc, 0x14,
0xcc, 0x13, 0xcc, 0x15, 0xff, 0x85, 0x00, 0xc4,
0x00, 0xc3, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81,
- 0xc0, 0x32, 0xc0, 0x2e, 0xc0, 0x2a, 0xc0, 0x26,
- 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x9d, 0x00, 0x3d,
- 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f,
- 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13,
- 0xc0, 0x09, 0x00, 0xa2, 0x00, 0x9e, 0x00, 0x67,
- 0x00, 0x40, 0x00, 0x33, 0x00, 0x32, 0x00, 0xbe,
- 0x00, 0xbd, 0x00, 0x45, 0x00, 0x44, 0xc0, 0x31,
- 0xc0, 0x2d, 0xc0, 0x29, 0xc0, 0x25, 0xc0, 0x0e,
- 0xc0, 0x04, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f,
+ 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0,
+ 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27,
+ 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0xa2,
+ 0x00, 0x9e, 0x00, 0x67, 0x00, 0x40, 0x00, 0x33,
+ 0x00, 0x32, 0x00, 0xbe, 0x00, 0xbd, 0x00, 0x45,
+ 0x00, 0x44, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f,
0x00, 0xba, 0x00, 0x41, 0x00, 0x07, 0xc0, 0x11,
- 0xc0, 0x07, 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05,
- 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
- 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a,
+ 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12,
+ 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a,
0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff,
};
@@ -178,48 +162,40 @@ static unsigned char cipher_list_tls12_chacha[] = {
0x00, 0xa3, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x6a,
0x00, 0x39, 0x00, 0x38, 0xff, 0x85, 0x00, 0xc4,
0x00, 0xc3, 0x00, 0x88, 0x00, 0x87, 0x00, 0x81,
- 0xc0, 0x32, 0xc0, 0x2e, 0xc0, 0x2a, 0xc0, 0x26,
- 0xc0, 0x0f, 0xc0, 0x05, 0x00, 0x9d, 0x00, 0x3d,
- 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f,
- 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13,
- 0xc0, 0x09, 0x00, 0xa2, 0x00, 0x9e, 0x00, 0x67,
- 0x00, 0x40, 0x00, 0x33, 0x00, 0x32, 0x00, 0xbe,
- 0x00, 0xbd, 0x00, 0x45, 0x00, 0x44, 0xc0, 0x31,
- 0xc0, 0x2d, 0xc0, 0x29, 0xc0, 0x25, 0xc0, 0x0e,
- 0xc0, 0x04, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f,
+ 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0,
+ 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27,
+ 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0xa2,
+ 0x00, 0x9e, 0x00, 0x67, 0x00, 0x40, 0x00, 0x33,
+ 0x00, 0x32, 0x00, 0xbe, 0x00, 0xbd, 0x00, 0x45,
+ 0x00, 0x44, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f,
0x00, 0xba, 0x00, 0x41, 0x00, 0x07, 0xc0, 0x11,
- 0xc0, 0x07, 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05,
- 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
- 0x00, 0x13, 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a,
+ 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12,
+ 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a,
0x00, 0x15, 0x00, 0x12, 0x00, 0x09, 0x00, 0xff,
};
static unsigned char client_hello_tls12[] = {
- 0x16, 0x03, 0x01, 0x01, 0x41, 0x01, 0x00, 0x01,
- 0x3d, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x16, 0x03, 0x01, 0x01, 0x21, 0x01, 0x00, 0x01,
+ 0x1d, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xcc, 0xa9,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xcc, 0xa9,
0xcc, 0xa8, 0xcc, 0xaa, 0xcc, 0x14, 0xcc, 0x13,
0xcc, 0x15, 0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28,
0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, 0x00, 0xa3,
0x00, 0x9f, 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x39,
0x00, 0x38, 0xff, 0x85, 0x00, 0xc4, 0x00, 0xc3,
- 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0xc0, 0x32,
- 0xc0, 0x2e, 0xc0, 0x2a, 0xc0, 0x26, 0xc0, 0x0f,
- 0xc0, 0x05, 0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35,
- 0x00, 0xc0, 0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b,
- 0xc0, 0x27, 0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09,
- 0x00, 0xa2, 0x00, 0x9e, 0x00, 0x67, 0x00, 0x40,
- 0x00, 0x33, 0x00, 0x32, 0x00, 0xbe, 0x00, 0xbd,
- 0x00, 0x45, 0x00, 0x44, 0xc0, 0x31, 0xc0, 0x2d,
- 0xc0, 0x29, 0xc0, 0x25, 0xc0, 0x0e, 0xc0, 0x04,
+ 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x9d,
+ 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84,
+ 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23,
+ 0xc0, 0x13, 0xc0, 0x09, 0x00, 0xa2, 0x00, 0x9e,
+ 0x00, 0x67, 0x00, 0x40, 0x00, 0x33, 0x00, 0x32,
+ 0x00, 0xbe, 0x00, 0xbd, 0x00, 0x45, 0x00, 0x44,
0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba,
0x00, 0x41, 0x00, 0x07, 0xc0, 0x11, 0xc0, 0x07,
- 0xc0, 0x0c, 0xc0, 0x02, 0x00, 0x05, 0x00, 0x04,
- 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x13,
- 0xc0, 0x0d, 0xc0, 0x03, 0x00, 0x0a, 0x00, 0x15,
+ 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
+ 0x00, 0x16, 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15,
0x00, 0x12, 0x00, 0x09, 0x00, 0xff, 0x01, 0x00,
0x00, 0x74, 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00,
0x01, 0x02, 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38,