[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2256f456bca4d32c587ab08e2971479a3480b3a3 (commit)
      from  b1d9be4db3ffa1496016e577e004a67fcc8b4d85 (commit)


- Log -----------------------------------------------------------------
commit 2256f456bca4d32c587ab08e2971479a3480b3a3
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 14 09:59:51 2017 +0000

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2928)

-----------------------------------------------------------------------

Summary of changes:
 test/ossl_shim/ossl_config.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/ossl_shim/ossl_config.json b/test/ossl_shim/ossl_config.json
index c4a4254..b1707ae 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" : {
     }