From 37392584e512230f90ecbecb535ed1ac0bedd0af Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 23 Jan 2019 11:11:52 +0000
Subject: Sync the handshakes table with the generated table in regress. This
 sorts the valid handshakes with respect to ascending flags value instead of
 the ad-hoc order produced by the algorithm.

ok jsing
---
 src/lib/libssl/tls13_handshake.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/tls13_handshake.c b/src/lib/libssl/tls13_handshake.c
index a93d5ea71f..5863b0363b 100644
--- a/src/lib/libssl/tls13_handshake.c
+++ b/src/lib/libssl/tls13_handshake.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tls13_handshake.c,v 1.20 2019/01/23 04:25:18 tb Exp $	*/
+/*	$OpenBSD: tls13_handshake.c,v 1.21 2019/01/23 11:11:52 tb Exp $	*/
 /*
  * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org>
  * Copyright (c) 2019 Joel Sing <jsing@openbsd.org>
@@ -166,16 +166,16 @@ enum tls13_message_type handshakes[][TLS13_NUM_MESSAGE_TYPES] = {
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
-	[NEGOTIATED | WITH_CCV] = {
+	[NEGOTIATED | WITH_HRR] = {
 		CLIENT_HELLO,
 		SERVER_HELLO,
+		CLIENT_HELLO_RETRY,
 		SERVER_ENCRYPTED_EXTENSIONS,
 		SERVER_CERTIFICATE_REQUEST,
 		SERVER_CERTIFICATE,
 		SERVER_CERTIFICATE_VERIFY,
 		SERVER_FINISHED,
 		CLIENT_CERTIFICATE,
-		CLIENT_CERTIFICATE_VERIFY,
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
@@ -189,58 +189,58 @@ enum tls13_message_type handshakes[][TLS13_NUM_MESSAGE_TYPES] = {
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
-	[NEGOTIATED | WITH_PSK] = {
+	[NEGOTIATED | WITH_HRR | WITHOUT_CR] = {
 		CLIENT_HELLO,
 		SERVER_HELLO,
+		CLIENT_HELLO_RETRY,
 		SERVER_ENCRYPTED_EXTENSIONS,
+		SERVER_CERTIFICATE,
+		SERVER_CERTIFICATE_VERIFY,
 		SERVER_FINISHED,
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
-	[NEGOTIATED | WITH_HRR] = {
+	[NEGOTIATED | WITH_PSK] = {
 		CLIENT_HELLO,
 		SERVER_HELLO,
-		CLIENT_HELLO_RETRY,
 		SERVER_ENCRYPTED_EXTENSIONS,
-		SERVER_CERTIFICATE_REQUEST,
-		SERVER_CERTIFICATE,
-		SERVER_CERTIFICATE_VERIFY,
 		SERVER_FINISHED,
-		CLIENT_CERTIFICATE,
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
-	[NEGOTIATED | WITH_HRR | WITH_CCV] = {
+	[NEGOTIATED | WITH_HRR | WITH_PSK] = {
 		CLIENT_HELLO,
 		SERVER_HELLO,
 		CLIENT_HELLO_RETRY,
 		SERVER_ENCRYPTED_EXTENSIONS,
-		SERVER_CERTIFICATE_REQUEST,
-		SERVER_CERTIFICATE,
-		SERVER_CERTIFICATE_VERIFY,
 		SERVER_FINISHED,
-		CLIENT_CERTIFICATE,
-		CLIENT_CERTIFICATE_VERIFY,
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
-	[NEGOTIATED | WITH_HRR | WITHOUT_CR] = {
+	[NEGOTIATED | WITH_CCV] = {
 		CLIENT_HELLO,
 		SERVER_HELLO,
-		CLIENT_HELLO_RETRY,
 		SERVER_ENCRYPTED_EXTENSIONS,
+		SERVER_CERTIFICATE_REQUEST,
 		SERVER_CERTIFICATE,
 		SERVER_CERTIFICATE_VERIFY,
 		SERVER_FINISHED,
+		CLIENT_CERTIFICATE,
+		CLIENT_CERTIFICATE_VERIFY,
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
-	[NEGOTIATED | WITH_HRR | WITH_PSK] = {
+	[NEGOTIATED | WITH_HRR | WITH_CCV] = {
 		CLIENT_HELLO,
 		SERVER_HELLO,
 		CLIENT_HELLO_RETRY,
 		SERVER_ENCRYPTED_EXTENSIONS,
+		SERVER_CERTIFICATE_REQUEST,
+		SERVER_CERTIFICATE,
+		SERVER_CERTIFICATE_VERIFY,
 		SERVER_FINISHED,
+		CLIENT_CERTIFICATE,
+		CLIENT_CERTIFICATE_VERIFY,
 		CLIENT_FINISHED,
 		APPLICATION_DATA,
 	},
-- 
cgit v1.2.3-55-g6feb