Update client tests for changes in default EC formats/curves.

1 files changed, 31 insertions, 52 deletions

diff --git a/regress/lib/libssl/client/clienttest.c b/regress/lib/libssl/client/clienttest.c
index b61308d3a9e..03c5a7c5712 100644
--- a/regress/lib/libssl/client/clienttest.c
+++ b/regress/lib/libssl/client/clienttest.c
@@ -72,12 +72,12 @@ static unsigned char cipher_list_tls10[] = {
 };
 
 static unsigned char client_hello_tls10[] = {
-	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, 0x3e, 0xc0, 0x14,
+	0x16, 0x03, 0x01, 0x00, 0x81, 0x01, 0x00, 0x00,
+	0x7d, 0x03, 0x01, 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, 0x3e, 0xc0, 0x14,
 	0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85,
 	0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35,
 	0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33,
@@ -85,17 +85,10 @@ static unsigned char client_hello_tls10[] = {
 	0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 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, 0x4c,
-	0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02,
-	0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d,
-	0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c,
-	0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
-	0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
-	0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
-	0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
-	0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
-	0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
-	0x00, 0x23, 0x00, 0x00,
+	0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
+	0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
+	0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
+	0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
 };
 
 static unsigned char cipher_list_tls11[] = {
@@ -110,12 +103,12 @@ static unsigned char cipher_list_tls11[] = {
 };
 
 static unsigned char client_hello_tls11[] = {
-	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, 0x3e, 0xc0, 0x14,
+	0x16, 0x03, 0x01, 0x00, 0x81, 0x01, 0x00, 0x00,
+	0x7d, 0x03, 0x02, 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, 0x3e, 0xc0, 0x14,
 	0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85,
 	0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35,
 	0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33,
@@ -123,17 +116,10 @@ static unsigned char client_hello_tls11[] = {
 	0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 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, 0x4c,
-	0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02,
-	0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d,
-	0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c,
-	0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
-	0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
-	0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
-	0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
-	0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
-	0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
-	0x00, 0x23, 0x00, 0x00,
+	0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
+	0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
+	0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
+	0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
 };
 
 static unsigned char cipher_list_tls12_aes[] = {
@@ -175,8 +161,8 @@ static unsigned char cipher_list_tls12_chacha[] = {
 };
 
 static unsigned char client_hello_tls12[] = {
-	0x16, 0x03, 0x01, 0x01, 0x21, 0x01, 0x00, 0x01,
-	0x1d, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x16, 0x03, 0x01, 0x00, 0xeb, 0x01, 0x00, 0x00,
+	0xe7, 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,
@@ -196,22 +182,15 @@ static unsigned char client_hello_tls12[] = {
 	0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 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, 0x76,
-	0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02,
-	0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d,
-	0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c,
-	0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
-	0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
-	0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
-	0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
-	0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
-	0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
-	0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x26,
-	0x00, 0x24, 0x06, 0x01, 0x06, 0x02, 0x06, 0x03,
-	0xef, 0xef, 0x05, 0x01, 0x05, 0x02, 0x05, 0x03,
-	0x04, 0x01, 0x04, 0x02, 0x04, 0x03, 0xee, 0xee,
-	0xed, 0xed, 0x03, 0x01, 0x03, 0x02, 0x03, 0x03,
-	0x02, 0x01, 0x02, 0x02, 0x02, 0x03,
+	0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x40,
+	0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
+	0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
+	0x00, 0x18, 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d,
+	0x00, 0x26, 0x00, 0x24, 0x06, 0x01, 0x06, 0x02,
+	0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x02,
+	0x05, 0x03, 0x04, 0x01, 0x04, 0x02, 0x04, 0x03,
+	0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x02,
+	0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03,
 };
 
 struct client_hello_test {