[SVN-Commit] r1759 - in branches/firefox33/www: firefox-esr/files libxul/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Nov  7 06:40:31 2014
New Revision: 1759

Log:
unbreak make patch

Deleted:
   branches/firefox33/www/firefox-esr/files/patch-bug1076983
   branches/firefox33/www/libxul/files/patch-bug1076983

Deleted: branches/firefox33/www/firefox-esr/files/patch-bug1076983
==============================================================================
--- branches/firefox33/www/firefox-esr/files/patch-bug1076983	Fri Nov  7 06:40:31 2014	(r1758)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,45 +0,0 @@
-commit e10ee74
-Author: Martin Thomson <martin.thomson at gmail.com>
-Date:   Tue Oct 14 17:17:35 2014 -0700
-
-    Bug 1076983 - Disabling SSL 3.0 with pref
----
- netwerk/base/public/security-prefs.js       | 2 +-
- security/manager/ssl/src/nsNSSComponent.cpp | 7 +++----
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git netwerk/base/public/security-prefs.js netwerk/base/public/security-prefs.js
-index 352552e..c12731b 100644
---- netwerk/base/public/security-prefs.js
-+++ netwerk/base/public/security-prefs.js
-@@ -2,7 +2,7 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
--pref("security.tls.version.min", 0);
-+pref("security.tls.version.min", 1);
- pref("security.tls.version.max", 3);
- 
- pref("security.ssl.allow_unrestricted_renego_everywhere__temporarily_available_pref", false);
-diff --git security/manager/ssl/src/nsNSSComponent.cpp security/manager/ssl/src/nsNSSComponent.cpp
-index 8cab67b..772959d 100644
---- security/manager/ssl/src/nsNSSComponent.cpp
-+++ security/manager/ssl/src/nsNSSComponent.cpp
-@@ -829,14 +829,13 @@ void nsNSSComponent::setValidationOptions(bool isInitialSetting,
-   mDefaultCertVerifier = new SharedCertVerifier(odc, osc, ogc, pinningMode);
- }
- 
--// Enable the TLS versions given in the prefs, defaulting to SSL 3.0 (min
--// version) and TLS 1.2 (max version) when the prefs aren't set or set to
--// invalid values.
-+// Enable the TLS versions given in the prefs, defaulting to TLS 1.0 (min) and
-+// TLS 1.2 (max) when the prefs aren't set or set to invalid values.
- nsresult
- nsNSSComponent::setEnabledTLSVersions()
- {
-   // keep these values in sync with security-prefs.js
--  static const int32_t PSM_DEFAULT_MIN_TLS_VERSION = 0;
-+  static const int32_t PSM_DEFAULT_MIN_TLS_VERSION = 1;
-   static const int32_t PSM_DEFAULT_MAX_TLS_VERSION = 3;
- 
-   int32_t minVersion = Preferences::GetInt("security.tls.version.min",

Deleted: branches/firefox33/www/libxul/files/patch-bug1076983
==============================================================================
--- branches/firefox33/www/libxul/files/patch-bug1076983	Fri Nov  7 06:40:31 2014	(r1758)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,45 +0,0 @@
-commit e10ee74
-Author: Martin Thomson <martin.thomson at gmail.com>
-Date:   Tue Oct 14 17:17:35 2014 -0700
-
-    Bug 1076983 - Disabling SSL 3.0 with pref
----
- netwerk/base/public/security-prefs.js       | 2 +-
- security/manager/ssl/src/nsNSSComponent.cpp | 7 +++----
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git netwerk/base/public/security-prefs.js netwerk/base/public/security-prefs.js
-index 352552e..c12731b 100644
---- netwerk/base/public/security-prefs.js
-+++ netwerk/base/public/security-prefs.js
-@@ -2,7 +2,7 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
--pref("security.tls.version.min", 0);
-+pref("security.tls.version.min", 1);
- pref("security.tls.version.max", 3);
- 
- pref("security.ssl.allow_unrestricted_renego_everywhere__temporarily_available_pref", false);
-diff --git security/manager/ssl/src/nsNSSComponent.cpp security/manager/ssl/src/nsNSSComponent.cpp
-index 8cab67b..772959d 100644
---- security/manager/ssl/src/nsNSSComponent.cpp
-+++ security/manager/ssl/src/nsNSSComponent.cpp
-@@ -829,14 +829,13 @@ void nsNSSComponent::setValidationOptions(bool isInitialSetting,
-   mDefaultCertVerifier = new SharedCertVerifier(odc, osc, ogc, pinningMode);
- }
- 
--// Enable the TLS versions given in the prefs, defaulting to SSL 3.0 (min
--// version) and TLS 1.2 (max version) when the prefs aren't set or set to
--// invalid values.
-+// Enable the TLS versions given in the prefs, defaulting to TLS 1.0 (min) and
-+// TLS 1.2 (max) when the prefs aren't set or set to invalid values.
- nsresult
- nsNSSComponent::setEnabledTLSVersions()
- {
-   // keep these values in sync with security-prefs.js
--  static const int32_t PSM_DEFAULT_MIN_TLS_VERSION = 0;
-+  static const int32_t PSM_DEFAULT_MIN_TLS_VERSION = 1;
-   static const int32_t PSM_DEFAULT_MAX_TLS_VERSION = 3;
- 
-   int32_t minVersion = Preferences::GetInt("security.tls.version.min",