From 1b3e966cf650a7adec5d20e83c5d933483af595a Mon Sep 17 00:00:00 2001
From: Joseph Birr-Pixton <jpixton@gmail.com>
Date: Mon, 17 Sep 2018 21:07:44 +0100
Subject: [PATCH] Deal with tests when OpenSSL supports TLS1.3

---
 tests/curves.rs   |  4 ++--
 tests/errors.rs   | 14 --------------
 tests/features.rs | 14 ++++++++++----
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/tests/curves.rs b/tests/curves.rs
index 7cd98c1e1e..cebe033255 100644
--- a/tests/curves.rs
+++ b/tests/curves.rs
@@ -11,7 +11,7 @@ fn curve_nistp256() {
     server.run();
     server.client()
         .verbose()
-        .expect_log(r"ECDHE curve is ECParameters \{ curve_type: NamedCurve, named_group: secp256r1 \}")
+        .expect_log(r"(ECDHE curve is ECParameters \{ curve_type: NamedCurve, named_group: secp256r1 \}|group: secp256r1)")
         .go();
     server.kill();
 }
@@ -23,7 +23,7 @@ fn curve_nistp384() {
     server.run();
     server.client()
         .verbose()
-        .expect_log(r"ECDHE curve is ECParameters \{ curve_type: NamedCurve, named_group: secp384r1 \}")
+        .expect_log(r"(ECDHE curve is ECParameters \{ curve_type: NamedCurve, named_group: secp384r1 \}|group: secp384r1)")
         .go();
     server.kill();
 }
diff --git a/tests/errors.rs b/tests/errors.rs
index 37e5ddd291..c801c68cad 100644
--- a/tests/errors.rs
+++ b/tests/errors.rs
@@ -4,20 +4,6 @@
 mod common;
 use common::OpenSSLServer;
 
-#[test]
-fn no_tls12() {
-    let mut server = OpenSSLServer::new_rsa(8000);
-    server.arg("-no_tls1_2");
-    server.run();
-
-    server.client()
-        .verbose()
-        .fails()
-        .expect_log("TLS alert received:")
-        .expect(r"TLS error: AlertReceived\((HandshakeFailure|ProtocolVersion)\)")
-        .go();
-}
-
 #[test]
 fn no_ecdhe() {
     let mut server = OpenSSLServer::new_rsa(8010);
diff --git a/tests/features.rs b/tests/features.rs
index 7d16ae909a..d51847e141 100644
--- a/tests/features.rs
+++ b/tests/features.rs
@@ -15,6 +15,7 @@ fn alpn_offer() {
     let mut server = OpenSSLServer::new_rsa(9000);
     server.arg("-alpn")
         .arg("ponytown,breakfast,edgware")
+        .arg("-tls1_2")
         .run();
 
     if !server.running() {
@@ -78,7 +79,8 @@ fn alpn_agree() {
 #[test]
 fn client_auth_by_client() {
     let mut server = OpenSSLServer::new_rsa(9020);
-    server.arg("-verify").arg("0");
+    server.arg("-verify").arg("0")
+          .arg("-tls1_2");
     server.run();
 
     server.client()
@@ -95,7 +97,8 @@ fn client_auth_by_client() {
 #[test]
 fn client_auth_by_client_with_ecdsa_suite() {
     let mut server = OpenSSLServer::new_ecdsa(9025);
-    server.arg("-verify").arg("0");
+    server.arg("-verify").arg("0")
+          .arg("-tls1_2");
     server.run();
 
     server.client()
@@ -112,7 +115,8 @@ fn client_auth_by_client_with_ecdsa_suite() {
 #[test]
 fn client_auth_requested_but_unsupported() {
     let mut server = OpenSSLServer::new_rsa(9030);
-    server.arg("-verify").arg("0");
+    server.arg("-verify").arg("0")
+          .arg("-tls1_2");
     server.run();
 
     server.client()
@@ -128,7 +132,8 @@ fn client_auth_requested_but_unsupported() {
 #[test]
 fn client_auth_required_but_unsupported() {
     let mut server = OpenSSLServer::new_rsa(9040);
-    server.arg("-Verify").arg("0");
+    server.arg("-Verify").arg("0")
+          .arg("-tls1_2");
     server.run();
 
     server.client()
@@ -194,6 +199,7 @@ fn client_auth_by_server_required() {
 #[test]
 fn client_resumes() {
     let mut server = OpenSSLServer::new_rsa(9070);
+    server.arg("-tls1_2");
     server.run();
 
     // no resumption without client support