diff options
-rw-r--r-- | gtests/nss_bogo_shim/config.json | 21 | ||||
-rwxr-xr-x | tests/bogo/bogo.sh | 2 |
2 files changed, 15 insertions, 8 deletions
diff --git a/gtests/nss_bogo_shim/config.json b/gtests/nss_bogo_shim/config.json index 1ad0119ca..0a6864f73 100644 --- a/gtests/nss_bogo_shim/config.json +++ b/gtests/nss_bogo_shim/config.json @@ -1,12 +1,19 @@ { "DisabledTests": { - "*TLS13*":"(NSS=18, BoGo=16)", - "*HelloRetryRequest*":"(NSS=18, BoGo=16)", - "*KeyShare*":"(NSS=18, BoGo=16)", - "*EncryptedExtensions*":"(NSS=18, BoGo=16)", - "*ServerHelloSignatureAlgorithms*":"(NSS=18, BoGo=16)", - "*SecondClientHello*":"(NSS=18, BoGo=16)", - "*IgnoreClientVersionOrder*":"(NSS=18, BoGo=16)", + "### These tests break whenever we rev versions, so just leave them here for easy uncommenting":"", + "#*TLS13*":"(NSS=18, BoGo=16)", + "#*HelloRetryRequest*":"(NSS=18, BoGo=16)", + "#*KeyShare*":"(NSS=18, BoGo=16)", + "#*EncryptedExtensions*":"(NSS=18, BoGo=16)", + "#*ServerHelloSignatureAlgorithms*":"(NSS=18, BoGo=16)", + "#*SecondClientHello*":"(NSS=18, BoGo=16)", + "#*IgnoreClientVersionOrder*":"(NSS=18, BoGo=16)", + "Resume-Server-BinderWrongLength":"Alert disagreement (Bug 1317633)", + "Resume-Server-NoPSKBinder":"Alert disagreement (Bug 1317633)", + "CheckRecordVersion-TLS*":"Bug 1317634", + "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)", + "Resume-Server-InvalidPSKBinder":"(Bogo incorrectly expects 'illegal_parameter')", "FallbackSCSV-VersionMatch":"Draft version mismatch (NSS=15, BoGo=14)", "*KeyUpdate*":"KeyUpdate Unimplemented", "ClientAuth-NoFallback-TLS13":"Disagreement about alerts. Bug 1294975", diff --git a/tests/bogo/bogo.sh b/tests/bogo/bogo.sh index 05f10c8d0..e17f5882d 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 3ef7697ed30f28367395a5aafb57a12a19906d96 + git -C "$BORING" checkout -q f2f76d2417b1e1829a6fb10426e422ea7634065d fi SCRIPTNAME="bogo.sh" |