Date: Fri, 23 Dec 2016 04:45:46 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429224 - in branches/2016Q4: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/s... Message-ID: <201612230445.uBN4jkkF034988@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Dec 23 04:45:46 2016 New Revision: 429224 URL: https://svnweb.freebsd.org/changeset/ports/429224 Log: MFH: r428566 gecko: improve NSS 3.28 compatibility https://bugzilla.mozilla.org/show_bug.cgi?id=1323209 Approved by: ports-secteam (junovitch) Added: branches/2016Q4/mail/thunderbird/files/patch-bug1290037 - copied unchanged from r428566, head/mail/thunderbird/files/patch-bug1290037 branches/2016Q4/www/firefox-esr/files/patch-bug1290037 - copied unchanged from r428566, head/www/firefox-esr/files/patch-bug1290037 branches/2016Q4/www/firefox/files/patch-bug1290037 - copied unchanged from r428566, head/www/firefox/files/patch-bug1290037 branches/2016Q4/www/libxul/files/patch-bug1290037 - copied unchanged from r428566, head/www/libxul/files/patch-bug1290037 branches/2016Q4/www/seamonkey/files/patch-bug1290037 - copied unchanged from r428566, head/www/seamonkey/files/patch-bug1290037 Modified: branches/2016Q4/mail/thunderbird/Makefile branches/2016Q4/www/firefox-esr/Makefile branches/2016Q4/www/firefox/Makefile branches/2016Q4/www/libxul/Makefile branches/2016Q4/www/seamonkey/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/mail/thunderbird/Makefile ============================================================================== --- branches/2016Q4/mail/thunderbird/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/mail/thunderbird/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: branches/2016Q4/mail/thunderbird/files/patch-bug1290037 (from r428566, head/mail/thunderbird/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/mail/thunderbird/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/mail/thunderbird/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer <franziskuskiefer@gmail.com> +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- mozilla/netwerk/protocol/http/Http2Session.cpp ++++ mozilla/netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/firefox-esr/Makefile ============================================================================== --- branches/2016Q4/www/firefox-esr/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/firefox-esr/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 45.6.0 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Copied: branches/2016Q4/www/firefox-esr/files/patch-bug1290037 (from r428566, head/www/firefox-esr/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/firefox-esr/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/firefox-esr/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer <franziskuskiefer@gmail.com> +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- netwerk/protocol/http/Http2Session.cpp ++++ netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/firefox/Makefile ============================================================================== --- branches/2016Q4/www/firefox/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/firefox/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 50.1.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied: branches/2016Q4/www/firefox/files/patch-bug1290037 (from r428566, head/www/firefox/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/firefox/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/firefox/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer <franziskuskiefer@gmail.com> +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- netwerk/protocol/http/Http2Session.cpp ++++ netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/libxul/Makefile ============================================================================== --- branches/2016Q4/www/libxul/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/libxul/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -3,7 +3,7 @@ PORTNAME= libxul DISTVERSION= 45.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source Copied: branches/2016Q4/www/libxul/files/patch-bug1290037 (from r428566, head/www/libxul/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/libxul/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/libxul/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer <franziskuskiefer@gmail.com> +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- netwerk/protocol/http/Http2Session.cpp ++++ netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/seamonkey/Makefile ============================================================================== --- branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -4,6 +4,7 @@ PORTNAME= seamonkey DISTVERSION= 2.46 MOZILLA_VER= 49 # above + 3 +PORTREVISION= 1 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source Copied: branches/2016Q4/www/seamonkey/files/patch-bug1290037 (from r428566, head/www/seamonkey/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/seamonkey/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer <franziskuskiefer@gmail.com> +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- mozilla/netwerk/protocol/http/Http2Session.cpp ++++ mozilla/netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612230445.uBN4jkkF034988>