Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 72 insertions, 7 deletions

diff --git a/security/nss/gtests/nss_bogo_shim/config.json b/security/nss/gtests/nss_bogo_shim/config.json
index 4109bd2ca..03f875466 100644
--- a/security/nss/gtests/nss_bogo_shim/config.json
+++ b/security/nss/gtests/nss_bogo_shim/config.json
@@ -1,12 +1,78 @@
 {
     "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)",
+        "SendWarningAlerts-Pass":"BoringSSL updated",
+        "SendBogusAlertType":"BoringSSL updated",
+        "SendEmptyRecords-Pass":"BoringSSL updated",
+        "ExtraCompressionMethods-TLS12":"BoringSSL updated",
+        "SendSNIWarningAlert":"BoringSSL updated",
+        "NoNullCompression-TLS12":"BoringSSL updated",
+        "InvalidCompressionMethod":"BoringSSL updated",
+        "SupportTicketsWithSessionID":"BoringSSL updated",
+        "NoSharedCipher":"BoringSSL updated",
+        "ServerHelloBogusCipher":"BoringSSL updated",
+        "ClientHelloVersionTooHigh":"BoringSSL updated",
+        "ServerAuth-SignatureType":"BoringSSL updated",
+        "ECDSACurveMismatch-Verify-TLS12":"BoringSSL updated",
+        "UnknownExtension-Client":"BoringSSL updated",
+        "UnofferedExtension-Client":"BoringSSL updated",
+        "SendClientVersion-RSA":"BoringSSL updated",
+        "SupportedCurves-ServerHello-TLS12":"BoringSSL updated",
+        "Basic-Client*Sync":"BoringSSL updated",
+        "Resume-Client-CipherMismatch":"BoringSSL updated",
+        "ClientAuth-SignatureType":"BoringSSL updated",
+        "Agree-Digest-Default":"BoringSSL updated",
+        "Basic-Server*Sync":"BoringSSL updated",
+        "ClientAuth-*-Sync":"BoringSSL updated",
+        "RSA-PSS-Default*":"BoringSSL updated",
+        "Renegotiate-Server-NoExt*":"BoringSSL updated",
+        "Downgrade-TLS12*":"BoringSSL updated",
+        "MaxCBCPadding":"BoringSSL updated",
+        "UnknownCipher":"BoringSSL updated",
+        "LargeMessage":"BoringSSL updated",
+        "NoCommonCurves":"BoringSSL updated",
+        "UnknownCurve":"BoringSSL updated",
+        "SessionTicketsDisabled*":"BoringSSL updated",
+        "BadFinished-*":"BoringSSL updated",
+        "ServerSkipCertificateVerify":"BoringSSL updated",
+        "*VersionTolerance":"BoringSSL updated",
+        "ConflictingVersionNegotiation*":"BoringSSL updated",
+        "Ed25519DefaultDisable*":"BoringSSL updated",
+        "*SHA1-Fallback*":"BoringSSL updated",
+        "ExtendedMasterSecret-NoToNo*":"BoringSSL updated",
+        "ServerNameExtensionClientMissing*":"BoringSSL updated",
+        "NoClientCertificate*":"BoringSSL updated",
+        "ServerCipherFilter*":"BoringSSL updated",
+        "*FallbackSCSV*":"BoringSSL updated",
+        "LooseInitialRecordVersion*":"BoringSSL updated",
+        "ALPNClient*":"BoringSSL updated",
+        "MinimumVersion*":"BoringSSL updated",
+        "VersionNegotiation*":"BoringSSL updated",
+        "*Client-ClientAuth*":"BoringSSL updated",
+        "*Server-ClientAuth*":"BoringSSL updated",
+        "NoExtendedMasterSecret*":"BoringSSL updated",
+        "PointFormat*":"BoringSSL updated",
+        "*Sync-SplitHandshakeRecords*":"BoringSSL updated",
+        "*Sync-PackHandshakeFlight*":"BoringSSL updated",
+        "TicketSessionIDLength*":"BoringSSL updated",
+        "*LargeRecord*":"BoringSSL updated",
+        "WrongMessageType-NewSessionTicket":"BoringSSL updated",
+        "WrongMessageType*Certificate*":"BoringSSL updated",
+        "WrongMessageType*Client*":"BoringSSL updated",
+        "WrongMessageType*Server*":"BoringSSL updated",
+        "WrongMessageType*DTLS":"BoringSSL updated",
+        "GarbageCertificate*":"BoringSSL updated",
+        "EmptyExtensions*":"BoringSSL updated",
+        "*OmitExtensions*":"BoringSSL updated",
+        "SupportedVersionSelection-TLS12":"Should maybe reject TLS 1.2 in SH.supported_versions (Bug 1438266)",
+        "*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 +132,3 @@
         ":DIGEST_CHECK_FAILED:":"SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE"
     }
 }
-