From: Matt Caswell <matt@openssl.org>
Date: Tue, 14 Mar 2017 09:59:51 +0000 (+0000)
Subject: Make the Boring tests pass
X-Git-Tag: OpenSSL_1_1_1-pre1~2054
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=2256f456bca4d32c587ab08e2971479a3480b3a3

Make the Boring tests pass

The boring tests are currently failing because they send a PSK extension
which isn't in the last place. This is not allowed in the latest TLS1.3
specs. However the Boring tests we have are based on an old commit that
pre-date when that rule first appeared.

The proper solution is to update the tests to a later commit. But for now
to get travis to go green we disable the failing tests.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2928)
---

diff --git a/test/ossl_shim/ossl_config.json b/test/ossl_shim/ossl_config.json
index c4a4254135..b1707ae756 100644
--- a/test/ossl_shim/ossl_config.json
+++ b/test/ossl_shim/ossl_config.json
@@ -1184,7 +1184,20 @@
             "SkipHelloRetryRequest":"Test failure - reason unknown",
             "Peek-Alert":"Test failure - reason unknown",
             "TLS13-TrailingKeyShareData":"Test failure - reason unknown",
-            "Peek-KeyUpdate":"Test failure - reason unknown"
+            "Peek-KeyUpdate":"Test failure - reason unknown",
+            "Resume-Server-SSL3-SSL3":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-SSL3-TLS1":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-SSL3-TLS11":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS1-TLS1":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS1-TLS1-DTLS":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-SSL3-TLS12":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS1-TLS12":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS1-TLS11":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS1-TLS12-DTLS":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS11-TLS11":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS11-TLS12":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS12-TLS12":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement",
+            "Resume-Server-TLS12-TLS12-DTLS":"Test failure - runner using <draft17 TLS1.3 causes failures due to incorrect PSK extension placement"
     },
     "ErrorMap" : {
     }