Update due to removal of original chacha20-poly1305 cipher suites.

1 files changed, 39 insertions, 42 deletions

diff --git a/regress/lib/libssl/client/clienttest.c b/regress/lib/libssl/client/clienttest.c
index 659a533193c..d198d277ede 100644
--- a/regress/lib/libssl/client/clienttest.c
+++ b/regress/lib/libssl/client/clienttest.c
@@ -120,21 +120,40 @@ static unsigned char cipher_list_tls12_aes[] = {
 	0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24,
 	0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b,
 	0x00, 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa,
-	0xcc, 0x14, 0xcc, 0x13, 0xcc, 0x15, 0xff, 0x85,
-	0x00, 0xc4, 0x00, 0x88, 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, 0x9e, 0x00, 0x67,
-	0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c,
-	0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41,
-	0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04,
-	0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a,
-	0x00, 0x15, 0x00, 0x09, 0x00, 0xff,
+	0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 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, 0x9e,
+	0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45,
+	0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba,
+	0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
+	0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
+	0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00, 0xff,
 };
 
 static unsigned char cipher_list_tls12_chacha[] = {
-	0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xcc, 0x14,
-	0xcc, 0x13, 0xcc, 0x15, 0xc0, 0x30, 0xc0, 0x2c,
+	0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30,
+	0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14,
+	0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39,
+	0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 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, 0x9e,
+	0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45,
+	0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba,
+	0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
+	0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
+	0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00, 0xff,
+};
+
+static unsigned char client_hello_tls12[] = {
+	0x16, 0x03, 0x01, 0x00, 0xc3, 0x01, 0x00, 0x00,
+	0xbf, 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, 0x60, 0xcc, 0xa9,
+	0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c,
 	0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a,
 	0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85,
 	0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d,
@@ -145,36 +164,14 @@ static unsigned char cipher_list_tls12_chacha[] = {
 	0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41,
 	0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04,
 	0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a,
-	0x00, 0x15, 0x00, 0x09, 0x00, 0xff,
-};
-
-static unsigned char client_hello_tls12[] = {
-	0x16, 0x03, 0x01, 0x00, 0xc9, 0x01, 0x00, 0x00,
-	0xc5, 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, 0x66, 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, 0x9f,
-	0x00, 0x6b, 0x00, 0x39, 0xff, 0x85, 0x00, 0xc4,
-	0x00, 0x88, 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, 0x9e, 0x00, 0x67, 0x00, 0x33,
-	0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c,
-	0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11,
-	0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, 0xc0, 0x12,
-	0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0x15,
-	0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x36,
-	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, 0x1c, 0x00, 0x1a, 0x06, 0x01, 0x06, 0x03,
-	0xef, 0xef, 0x05, 0x01, 0x05, 0x03, 0x04, 0x01,
-	0x04, 0x03, 0xee, 0xee, 0xed, 0xed, 0x03, 0x01,
-	0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
+	0x00, 0x15, 0x00, 0x09, 0x00, 0xff, 0x01, 0x00,
+	0x00, 0x36, 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, 0x1c, 0x00, 0x1a, 0x06, 0x01,
+	0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x03,
+	0x04, 0x01, 0x04, 0x03, 0xee, 0xee, 0xed, 0xed,
+	0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
 };
 
 struct client_hello_test {