Update regress test to reflect changes in the cipher list.

1 files changed, 62 insertions, 61 deletions

diff --git a/regress/lib/libssl/client/clienttest.c b/regress/lib/libssl/client/clienttest.c
index 24215f0944f..5b556794da5 100644
--- a/regress/lib/libssl/client/clienttest.c
+++ b/regress/lib/libssl/client/clienttest.c
@@ -152,55 +152,27 @@ static unsigned char cipher_list_tls12_aes[] = {
 	0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24,
 	0xc0, 0x14, 0xc0, 0x0a, 0x00, 0xa3, 0x00, 0x9f,
 	0x00, 0x6b, 0x00, 0x6a, 0x00, 0x39, 0x00, 0x38,
-	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, 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, 0x12, 0x00, 0x09,
-	0x00, 0xff,
+	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, 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, 0x12, 0x00, 0x09, 0x00, 0xff,
 };
 
 static unsigned char cipher_list_tls12_chacha[] = {
-	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, 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, 0x12, 0x00, 0x09,
-	0x00, 0xff,
-};
-
-static unsigned char client_hello_tls12[] = {
-	0x16, 0x03, 0x01, 0x01, 0x3b, 0x01, 0x00, 0x01,
-	0x37, 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, 0x9a, 0xcc, 0x14,
+	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,
@@ -220,21 +192,50 @@ static unsigned char client_hello_tls12[] = {
 	0x00, 0x04, 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, 0x74, 0x00, 0x0b, 0x00, 0x04,
-	0x03, 0x00, 0x01, 0x02, 0x00, 0x0a, 0x00, 0x3a,
-	0x00, 0x38, 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,
+};
+
+static unsigned char client_hello_tls12[] = {
+	0x16, 0x03, 0x01, 0x01, 0x41, 0x01, 0x00, 0x01,
+	0x3d, 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,
+	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, 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, 0x12, 0x00, 0x09, 0x00, 0xff, 0x01, 0x00,
+	0x00, 0x74, 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00,
+	0x01, 0x02, 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x38,
+	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,
 };
 
 struct client_hello_test {