diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-02 18:53:10 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-02 18:53:10 +0100 |
commit | 588ef662386ce30b28688e95f11f7fc7a52f8e25 (patch) | |
tree | a62b104d7b70d82767fbde6aeb782b1359302459 /testing/nss/ssl-renegotiate-transitional.patch | |
parent | 9ea487ed90ebf891571ea8fffd34c154cbf981df (diff) | |
parent | b479098a1b8d7cb545339cb225a7cde4988b2748 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/kdesvn/PKGBUILD
community/lwm/PKGBUILD
community/sakura/PKGBUILD
extra/openmpi/PKGBUILD
extra/qt/PKGBUILD
Diffstat (limited to 'testing/nss/ssl-renegotiate-transitional.patch')
-rw-r--r-- | testing/nss/ssl-renegotiate-transitional.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch deleted file mode 100644 index f457c5551..000000000 --- a/testing/nss/ssl-renegotiate-transitional.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable transitional scheme for ssl renegotiation: - -(from mozilla/security/nss/lib/ssl/ssl.h) -Disallow unsafe renegotiation in server sockets only, but allow clients -to continue to renegotiate with vulnerable servers. -This value should only be used during the transition period when few -servers have been upgraded. - -diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c -index f1d1921..c074360 100644 ---- a/mozilla/security/nss/lib/ssl/sslsock.c -+++ b/mozilla/security/nss/lib/ssl/sslsock.c -@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - }; - |