diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2018-03-08 09:56:58 +0100 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2018-03-08 09:56:58 +0100 |
| commit | f1f4718c2990c3ec3b4a99af05733edfd230cfe8 (patch) | |
| tree | 341a27b8163a1554e5714089257e3e06c4df5e20 | |
| parent | 6df7a45135987e1aad85702d0123d859bcb12349 (diff) | |
| download | nss-hg-f1f4718c2990c3ec3b4a99af05733edfd230cfe8.tar.gz | |
Bug 1443799 - Update BoGo to a runner that supports draft-23 r=franziskus
Reviewers: franziskus
Reviewed By: franziskus
Bug #: 1443799
Differential Revision: https://phabricator.services.mozilla.com/D696
| -rw-r--r-- | gtests/nss_bogo_shim/config.json | 4 | ||||
| -rw-r--r-- | gtests/nss_bogo_shim/nss_bogo_shim.cc | 6 | ||||
| -rwxr-xr-x | tests/bogo/bogo.sh | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/gtests/nss_bogo_shim/config.json b/gtests/nss_bogo_shim/config.json index 5804f6657..6dc155bef 100644 --- a/gtests/nss_bogo_shim/config.json +++ b/gtests/nss_bogo_shim/config.json @@ -1,6 +1,10 @@ { "DisabledTests": { "### These tests break whenever we rev versions, so just leave them here for easy uncommenting":"", + "ServerBogusVersion":"Check that SH.legacy_version=TLS12 when the server picks TLS 1.3 (Bug 1443761)", + "DummyPQPadding-Server*":"Boring is testing a dummy PQ padding extension", + "VerifyPreferences-Enforced":"NSS sends alerts in response to errors in protected handshake messages in the clear", + "Draft-Downgrade-Server":"Boring implements a draft downgrade sentinel used for measurements.", "FilterExtraAlgorithms":"NSS doesn't allow sending unsupported signature algorithms", "SendBogusAlertType":"Unexpected TLS alerts should abort connections (Bug 1438263)", "VerifyPreferences-Ed25519":"Add Ed25519 support (Bug 1325335)", diff --git a/gtests/nss_bogo_shim/nss_bogo_shim.cc b/gtests/nss_bogo_shim/nss_bogo_shim.cc index 64aba5844..72dbd5771 100644 --- a/gtests/nss_bogo_shim/nss_bogo_shim.cc +++ b/gtests/nss_bogo_shim/nss_bogo_shim.cc @@ -262,7 +262,11 @@ class TestAgent { } bool SetupOptions() { - SECStatus rv = SSL_OptionSet(ssl_fd_, SSL_ENABLE_SESSION_TICKETS, PR_TRUE); + SECStatus rv = + SSL_OptionSet(ssl_fd_, SSL_ENABLE_TLS13_COMPAT_MODE, PR_TRUE); + if (rv != SECSuccess) return false; + + rv = SSL_OptionSet(ssl_fd_, SSL_ENABLE_SESSION_TICKETS, PR_TRUE); if (rv != SECSuccess) return false; SSLVersionRange vrange; diff --git a/tests/bogo/bogo.sh b/tests/bogo/bogo.sh index d1a93bf9b..d108ef304 100755 --- a/tests/bogo/bogo.sh +++ b/tests/bogo/bogo.sh @@ -25,7 +25,7 @@ bogo_init() BORING=${BORING:=boringssl} if [ ! -d "$BORING" ]; then git clone -q https://boringssl.googlesource.com/boringssl "$BORING" - git -C "$BORING" checkout -q a513e86c1ebb1383930c9e504bdabcc302a85f30 + git -C "$BORING" checkout -q ec55dc15d3a39e5f1a58bfd79148729f38f6acb4 fi SCRIPTNAME="bogo.sh" |