diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2018-08-27 13:36:00 +1000 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2018-08-27 13:36:00 +1000 |
| commit | 3d2eb094dde31d386f6a63576ecaa68adddbadb3 (patch) | |
| tree | 5c1e007c81cab37123eab52a252481eb32346af9 | |
| parent | 2e5e5692326dda658ab1cdedb33468e208b82c58 (diff) | |
| download | nss-hg-3d2eb094dde31d386f6a63576ecaa68adddbadb3.tar.gz | |
Bug 1483129 - Update bogo tests, a=bustage
| -rw-r--r-- | gtests/nss_bogo_shim/config.json | 3 | ||||
| -rw-r--r-- | gtests/nss_bogo_shim/nss_bogo_shim.cc | 7 | ||||
| -rwxr-xr-x | tests/bogo/bogo.sh | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/gtests/nss_bogo_shim/config.json b/gtests/nss_bogo_shim/config.json index 391196311..66f55d38d 100644 --- a/gtests/nss_bogo_shim/config.json +++ b/gtests/nss_bogo_shim/config.json @@ -1,7 +1,7 @@ { "DisabledTests": { "### These tests break whenever we rev versions, so just leave them here for easy uncommenting":"", - "*TLS13Draft23*":"NSS supports draft 28 only.", + "*TLS13Draft*":"NSS supports RFC 8446 only.", "IgnoreClientVersionOrder":"Uses draft23", "DuplicateCertCompressionExt*":"BoGo expects that an alert is sent if more than one compression algorithm is sent.", "ServerBogusVersion":"Check that SH.legacy_version=TLS12 when the server picks TLS 1.3 (Bug 1443761)", @@ -18,6 +18,7 @@ "Resume-Server-BinderWrongLength":"Alert disagreement (Bug 1317633)", "Resume-Server-NoPSKBinder":"Alert disagreement (Bug 1317633)", "CheckRecordVersion-TLS*":"Bug 1317634", + "GarbageInitialRecordVersion-TLS*":"NSS doesn't strictly check the ClientHello record version", "GREASE-Server-TLS13":"BoringSSL GREASEs without a flag, but we ignore it", "TLS13-ExpectNoSessionTicketOnBadKEMode-Server":"Bug in NSS. Don't send ticket when not permitted by KE modes (Bug 1317635)", "*KeyUpdate*":"KeyUpdate Unimplemented", diff --git a/gtests/nss_bogo_shim/nss_bogo_shim.cc b/gtests/nss_bogo_shim/nss_bogo_shim.cc index b2b59c2f0..fc1d3259f 100644 --- a/gtests/nss_bogo_shim/nss_bogo_shim.cc +++ b/gtests/nss_bogo_shim/nss_bogo_shim.cc @@ -584,6 +584,8 @@ std::unique_ptr<const Config> ReadConfig(int argc, char** argv) { cfg->AddEntry<bool>("write-then-read", false); cfg->AddEntry<bool>("require-any-client-certificate", false); cfg->AddEntry<bool>("verify-peer", false); + cfg->AddEntry<bool>("is-handshaker-supported", false); + cfg->AddEntry<std::string>("handshaker-path", ""); // Ignore this cfg->AddEntry<std::string>("advertise-alpn", ""); cfg->AddEntry<std::string>("expect-alpn", ""); cfg->AddEntry<std::vector<int>>("signing-prefs", std::vector<int>()); @@ -628,6 +630,11 @@ int main(int argc, char** argv) { return GetExitCode(false); } + if (cfg->get<bool>("is-handshaker-supported")) { + std::cout << "No\n"; + return 0; + } + if (cfg->get<bool>("server")) { if (SSL_ConfigServerSessionIDCache(1024, 0, 0, ".") != SECSuccess) { std::cerr << "Couldn't configure session cache\n"; diff --git a/tests/bogo/bogo.sh b/tests/bogo/bogo.sh index 1038b864a..e3e9c32df 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 9af1edbe2201e6c6d58e5e484bf56281d8c751d9 + git -C "$BORING" checkout -q 7f4f41fa81c03e0f8ef1ab5b3d1d566b5968f107 fi SCRIPTNAME="bogo.sh" @@ -39,9 +39,9 @@ bogo_cleanup() . common/cleanup.sh } -cd ../ -cwd=$(cd $(dirname $0); pwd -P) -SOURCE_DIR="$cwd"/.. +cd "$(dirname "$0")" +cwd=$(pwd -P) +SOURCE_DIR="$(cd "$cwd"/../..; pwd -P)" bogo_init (cd "$BORING"/ssl/test/runner; GOPATH="$cwd" go test -pipe -shim-path "${BINDIR}"/nss_bogo_shim \ |