From 101a098151714705f06800dd03668b1d84167aa1 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 20 Jan 2020 08:40:16 +0000
Subject: Update libtls config regress to include TLSv1.3.

---
 src/regress/lib/libtls/config/configtest.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'src/regress/lib')

diff --git a/src/regress/lib/libtls/config/configtest.c b/src/regress/lib/libtls/config/configtest.c
index 61474aa85c..47aa03e826 100644
--- a/src/regress/lib/libtls/config/configtest.c
+++ b/src/regress/lib/libtls/config/configtest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: configtest.c,v 1.1 2017/12/09 16:43:09 jsing Exp $ */
+/* $OpenBSD: configtest.c,v 1.2 2020/01/20 08:40:16 jsing Exp $ */
 /*
  * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
  *
@@ -58,22 +58,27 @@ struct parse_protocols_test parse_protocols_tests[] = {
 		.want_return = 0,
 		.want_protocols = TLS_PROTOCOL_TLSv1_2,
 	},
+	{
+		.protostr = "tlsv1.3",
+		.want_return = 0,
+		.want_protocols = TLS_PROTOCOL_TLSv1_3,
+	},
 	{
 		.protostr = "",
 		.want_return = -1,
 		.want_protocols = 0,
 	},
 	{
-		.protostr = "tlsv1.0:tlsv1.1:tlsv1.2",
+		.protostr = "tlsv1.0:tlsv1.1:tlsv1.2:tlsv1.3",
 		.want_return = 0,
 		.want_protocols = TLS_PROTOCOL_TLSv1_0 | TLS_PROTOCOL_TLSv1_1 |
-		    TLS_PROTOCOL_TLSv1_2,
+		    TLS_PROTOCOL_TLSv1_2 | TLS_PROTOCOL_TLSv1_3,
 	},
 	{
-		.protostr = "tlsv1.0,tlsv1.1,tlsv1.2",
+		.protostr = "tlsv1.0,tlsv1.1,tlsv1.2,tlsv1.3",
 		.want_return = 0,
 		.want_protocols = TLS_PROTOCOL_TLSv1_0 | TLS_PROTOCOL_TLSv1_1 |
-		    TLS_PROTOCOL_TLSv1_2,
+		    TLS_PROTOCOL_TLSv1_2 | TLS_PROTOCOL_TLSv1_3,
 	},
 	{
 		.protostr = "tlsv1.1,tlsv1.2,tlsv1.0",
@@ -109,20 +114,22 @@ struct parse_protocols_test parse_protocols_tests[] = {
 	{
 		.protostr = "all,!tlsv1.0",
 		.want_return = 0,
-		.want_protocols = TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2,
+		.want_protocols = TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2 | \
+			TLS_PROTOCOL_TLSv1_3,
 	},
 	{
 		.protostr = "!tlsv1.0",
 		.want_return = 0,
-		.want_protocols = TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2,
+		.want_protocols = TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2 | \
+			TLS_PROTOCOL_TLSv1_3,
 	},
 	{
-		.protostr = "!tlsv1.0,!tlsv1.1",
+		.protostr = "!tlsv1.0,!tlsv1.1,!tlsv1.3",
 		.want_return = 0,
 		.want_protocols = TLS_PROTOCOL_TLSv1_2,
 	},
 	{
-		.protostr = "!tlsv1.0,!tlsv1.1,tlsv1.2",
+		.protostr = "!tlsv1.0,!tlsv1.1,tlsv1.2,!tlsv1.3",
 		.want_return = 0,
 		.want_protocols = TLS_PROTOCOL_TLSv1_2,
 	},
-- 
cgit v1.2.3-55-g6feb