diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 00:43:43 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 00:43:43 +0100 |
| commit | dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0 (patch) | |
| tree | c70154c611b0f03bdcba029f1c51c48e5f69eb36 /security/nss/gtests/nss_bogo_shim | |
| parent | 6f93b00559c8fe5b8dfaf59fcbaac8f1e0dd3366 (diff) | |
| parent | 788c588bf6f8907dc57b01cd1c86239215d3c661 (diff) | |
| download | UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar.gz UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar.lz UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.tar.xz UXP-dc7ceccf8bc0950e4daa5f0e7736d4c204526fc0.zip | |
Merge branch 'TLS-1.3'
Diffstat (limited to 'security/nss/gtests/nss_bogo_shim')
| -rw-r--r-- | security/nss/gtests/nss_bogo_shim/Makefile | 6 | ||||
| -rw-r--r-- | security/nss/gtests/nss_bogo_shim/config.json | 15 |
2 files changed, 8 insertions, 13 deletions
diff --git a/security/nss/gtests/nss_bogo_shim/Makefile b/security/nss/gtests/nss_bogo_shim/Makefile index fd6426d89..a2ac4b145 100644 --- a/security/nss/gtests/nss_bogo_shim/Makefile +++ b/security/nss/gtests/nss_bogo_shim/Makefile @@ -30,10 +30,6 @@ include ../common/gtest.mk CFLAGS += -I$(CORE_DEPTH)/lib/ssl -ifdef NSS_SSL_ENABLE_ZLIB -include $(CORE_DEPTH)/coreconf/zlib.mk -endif - ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### @@ -48,5 +44,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - - diff --git a/security/nss/gtests/nss_bogo_shim/config.json b/security/nss/gtests/nss_bogo_shim/config.json index 4109bd2ca..fed7ca993 100644 --- a/security/nss/gtests/nss_bogo_shim/config.json +++ b/security/nss/gtests/nss_bogo_shim/config.json @@ -1,12 +1,14 @@ { "DisabledTests": { "### 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)", - "#*SecondClientHello*":"(NSS=18, BoGo=16)", - "#*IgnoreClientVersionOrder*":"(NSS=18, BoGo=16)", + "*TLS13*":"(NSS=19, BoGo=18)", + "*HelloRetryRequest*":"(NSS=19, BoGo=18)", + "*KeyShare*":"(NSS=19, BoGo=18)", + "*EncryptedExtensions*":"(NSS=19, BoGo=18)", + "*SecondClientHello*":"(NSS=19, BoGo=18)", + "*IgnoreClientVersionOrder*":"(NSS=19, BoGo=18)", + "SkipEarlyData*":"(NSS=19, BoGo=18)", + "*Binder*":"(NSS=19, BoGo=18)", "Resume-Server-BinderWrongLength":"Alert disagreement (Bug 1317633)", "Resume-Server-NoPSKBinder":"Alert disagreement (Bug 1317633)", "CheckRecordVersion-TLS*":"Bug 1317634", @@ -66,4 +68,3 @@ ":DIGEST_CHECK_FAILED:":"SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE" } } - |