[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  10a1ec4833d16b15964bfa969b32d3b33534b760 (commit)
      from  47695810b3bea3e83e8bc2266e1672676a189efd (commit)


- Log -----------------------------------------------------------------
commit 10a1ec4833d16b15964bfa969b32d3b33534b760
Author: Matt Caswell <matt at openssl.org>
Date:   Thu May 25 11:26:18 2017 +0100

    Fix BoringSSL alert related test failures
    
    Commit bd990e2535 changed our handling of alerts. Some of the BoringSSl
    tests were expecting specific errors to be created if bad alerts were sent.
    Those errors have now changed as a result of that commit, so the BoringSSL
    test config needs to be updated to match.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3549)

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

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

diff --git a/test/ossl_shim/ossl_config.json b/test/ossl_shim/ossl_config.json
index 50433ed..26da5f0 100644
--- a/test/ossl_shim/ossl_config.json
+++ b/test/ossl_shim/ossl_config.json
@@ -256,7 +256,7 @@
         ":UNEXPECTED_RECORD:":"unexpected message",
         ":TLSV1_ALERT_RECORD_OVERFLOW:":"tlsv1 alert record overflow",
         ":WRONG_SSL_VERSION:":"no protocols available",
-        ":BAD_ALERT:":"tlsv1 alert record overflow",
+        ":BAD_ALERT:":"invalid alert",
         ":HTTP_REQUEST:":"http request",
         ":HTTPS_PROXY_REQUEST:":"https proxy request",
         ":WRONG_CERTIFICATE_TYPE:":"wrong certificate type",