Update regress for DES cipher suite removal.

2 files changed, 41 insertions, 49 deletions

diff --git a/regress/lib/libssl/client/clienttest.c b/regress/lib/libssl/client/clienttest.c
index d5effe3ffc7..cb45dc583c4 100644
--- a/regress/lib/libssl/client/clienttest.c
+++ b/regress/lib/libssl/client/clienttest.c
@@ -36,26 +36,24 @@ static unsigned char cipher_list_dtls1[] = {
 	0x00, 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84,
 	0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
 	0x00, 0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08,
-	0x00, 0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09,
-	0x00, 0xff,
+	0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
 };
 
 static unsigned char client_hello_dtls1[] = {
 	0x16, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x64, 0x01, 0x00, 0x00,
-	0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x58, 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, 0x2a, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x00, 0x00,
+	0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x54, 0xfe, 0xff, 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, 0x00, 0x26, 0xc0,
 	0x14, 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00,
 	0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0,
 	0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00,
 	0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08, 0x00,
-	0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09, 0x00,
-	0xff, 0x01, 0x00, 0x00, 0x04, 0x00, 0x23, 0x00,
-	0x00,
+	0x16, 0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00,
+	0x04, 0x00, 0x23, 0x00, 0x00,
 };
 
 static unsigned char cipher_list_tls10[] = {
@@ -64,27 +62,25 @@ static unsigned char cipher_list_tls10[] = {
 	0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
 	0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07,
 	0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
-	0x00, 0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09,
-	0x00, 0xff,
+	0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
 };
 
 static unsigned char client_hello_tls10[] = {
-	0x16, 0x03, 0x01, 0x00, 0x75, 0x01, 0x00, 0x00,
-	0x71, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x16, 0x03, 0x01, 0x00, 0x71, 0x01, 0x00, 0x00,
+	0x6d, 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, 0x32, 0xc0, 0x14,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0xc0, 0x14,
 	0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88,
 	0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
 	0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f,
 	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, 0x16, 0x00, 0x0b, 0x00, 0x02,
-	0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06,
-	0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x23,
-	0x00, 0x00,
+	0x00, 0x0a, 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[] = {
@@ -93,27 +89,25 @@ static unsigned char cipher_list_tls11[] = {
 	0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
 	0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07,
 	0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
-	0x00, 0x16, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x09,
-	0x00, 0xff,
+	0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
 };
 
 static unsigned char client_hello_tls11[] = {
-	0x16, 0x03, 0x01, 0x00, 0x75, 0x01, 0x00, 0x00,
-	0x71, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x16, 0x03, 0x01, 0x00, 0x71, 0x01, 0x00, 0x00,
+	0x6d, 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, 0x32, 0xc0, 0x14,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0xc0, 0x14,
 	0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88,
 	0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
-	0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f,
+	0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f,    
 	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, 0x16, 0x00, 0x0b, 0x00, 0x02,
-	0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06,
-	0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x23,
-	0x00, 0x00,
+	0x00, 0x0a, 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[] = {
@@ -128,7 +122,7 @@ static unsigned char cipher_list_tls12_aes[] = {
 	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,
+	0x00, 0x0a, 0x00, 0xff,
 };
 
 static unsigned char cipher_list_tls12_chacha[] = {
@@ -143,16 +137,16 @@ static unsigned char cipher_list_tls12_chacha[] = {
 	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,
+	0x00, 0x0a, 0x00, 0xff,
 };
 
 static unsigned char client_hello_tls12[] = {
-	0x16, 0x03, 0x01, 0x00, 0xc3, 0x01, 0x00, 0x00,
-	0xbf, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x16, 0x03, 0x01, 0x00, 0xbf, 0x01, 0x00, 0x00,
+	0xbb, 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,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 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,
@@ -164,14 +158,14 @@ static unsigned char client_hello_tls12[] = {
 	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, 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 {
diff --git a/regress/lib/libssl/unit/cipher_list.c b/regress/lib/libssl/unit/cipher_list.c
index e19acaa3ead..70f547abd60 100644
--- a/regress/lib/libssl/unit/cipher_list.c
+++ b/regress/lib/libssl/unit/cipher_list.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cipher_list.c,v 1.8 2017/10/11 17:35:53 jsing Exp $	*/
+/*	$OpenBSD: cipher_list.c,v 1.9 2018/06/02 16:35:02 jsing Exp $	*/
 /*
  * Copyright (c) 2015 Doug Hogan <doug@openbsd.org>
  * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
@@ -49,7 +49,6 @@ static uint8_t cipher_bytes[] = {
 	0xcc, 0xaa,	/* DHE-RSA-CHACHA20-POLY1305 */
 	0x00, 0x9c,	/* AES128-GCM-SHA256 */
 	0x00, 0x3d,	/* AES256-SHA256 */
-	0x00, 0x09,	/* DES-CBC-SHA */
 };
 
 static uint16_t cipher_values[] = {
@@ -58,7 +57,6 @@ static uint16_t cipher_values[] = {
 	0xccaa,		/* DHE-RSA-CHACHA20-POLY1305 */
 	0x009c,		/* AES128-GCM-SHA256 */
 	0x003d,		/* AES256-SHA256 */
-	0x0009,		/* DES-CBC-SHA */
 };
 
 #define N_CIPHERS (sizeof(cipher_bytes) / 2)