diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
| commit | 4a71b30364a4b6d1eaf16fcfdc8e873e6697f293 (patch) | |
| tree | a47014077c14579249859ad34afcc5a8f2f0730a /security/nss/gtests/nss_bogo_shim | |
| parent | d7da72799521386c110dbba73b1e483b00a0a56a (diff) | |
| parent | 2dad0ec41d0b69c0a815012e6ea4bdde81b2875b (diff) | |
| download | UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.gz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.lz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.xz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.zip | |
Merge branch 'NSS-335'
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" } } - |