summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Wang <li.wang@windriver.com>2014-05-19 13:42:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:11 +0100
commit65ebe470a8d69073d0ebce3111abdb0c2e2ebe3c (patch)
treeded201e272a78e10730ff0a3bce000a38fd59a23
parent0517d47172c68097e30a5063cd09c1da6158c71d (diff)
downloadopenembedded-core-contrib-65ebe470a8d69073d0ebce3111abdb0c2e2ebe3c.tar.gz
openembedded-core-contrib-65ebe470a8d69073d0ebce3111abdb0c2e2ebe3c.tar.bz2
openembedded-core-contrib-65ebe470a8d69073d0ebce3111abdb0c2e2ebe3c.zip
nss: CVE-2014-1492
the patch comes from: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1492 https://bugzilla.mozilla.org/show_bug.cgi?id=903885 changeset: 11063:709d4e597979 user: Kai Engert <kaie@kuix.de> date: Wed Mar 05 18:38:55 2014 +0100 summary: Bug 903885, address requests to clarify comments from wtc changeset: 11046:2ffa40a3ff55 tag: tip user: Wan-Teh Chang <wtc@google.com> date: Tue Feb 25 18:17:08 2014 +0100 summary: Bug 903885, fix IDNA wildcard handling v4, r=kaie changeset: 11045:15ea62260c21 user: Christian Heimes <sites@cheimes.de> date: Mon Feb 24 17:50:25 2014 +0100 summary: Bug 903885, fix IDNA wildcard handling, r=kaie (From OE-Core rev: a83a1b26704f1f3aadaa235bf38094f03b3610fd) Signed-off-by: Li Wang <li.wang@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nss/files/nss-CVE-2014-1492.patch68
-rw-r--r--meta/recipes-support/nss/nss.inc1
2 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/files/nss-CVE-2014-1492.patch b/meta/recipes-support/nss/files/nss-CVE-2014-1492.patch
new file mode 100644
index 0000000000..1be8a17870
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss-CVE-2014-1492.patch
@@ -0,0 +1,68 @@
+nss: CVE-2014-1492
+
+Upstream-Status: Backport
+
+the patch comes from:
+http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1492
+https://bugzilla.mozilla.org/show_bug.cgi?id=903885
+
+changeset: 11063:709d4e597979
+user: Kai Engert <kaie@kuix.de>
+date: Wed Mar 05 18:38:55 2014 +0100
+summary: Bug 903885, address requests to clarify comments from wtc
+
+changeset: 11046:2ffa40a3ff55
+tag: tip
+user: Wan-Teh Chang <wtc@google.com>
+date: Tue Feb 25 18:17:08 2014 +0100
+summary: Bug 903885, fix IDNA wildcard handling v4, r=kaie
+
+changeset: 11045:15ea62260c21
+user: Christian Heimes <sites@cheimes.de>
+date: Mon Feb 24 17:50:25 2014 +0100
+summary: Bug 903885, fix IDNA wildcard handling, r=kaie
+
+Signed-off-by: Li Wang <li.wang@windriver.com>
+---
+ nss/lib/certdb/certdb.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/nss/lib/certdb/certdb.c b/nss/lib/certdb/certdb.c
+index b7d22bd..91877b7 100644
+--- a/nss/lib/certdb/certdb.c
++++ b/nss/lib/certdb/certdb.c
+@@ -1381,7 +1381,7 @@ cert_TestHostName(char * cn, const char * hn)
+ return rv;
+ }
+ } else {
+- /* New approach conforms to RFC 2818. */
++ /* New approach conforms to RFC 6125. */
+ char *wildcard = PORT_Strchr(cn, '*');
+ char *firstcndot = PORT_Strchr(cn, '.');
+ char *secondcndot = firstcndot ? PORT_Strchr(firstcndot+1, '.') : NULL;
+@@ -1390,14 +1390,17 @@ cert_TestHostName(char * cn, const char * hn)
+ /* For a cn pattern to be considered valid, the wildcard character...
+ * - may occur only in a DNS name with at least 3 components, and
+ * - may occur only as last character in the first component, and
+- * - may be preceded by additional characters
++ * - may be preceded by additional characters, and
++ * - must not be preceded by an IDNA ACE prefix (xn--)
+ */
+ if (wildcard && secondcndot && secondcndot[1] && firsthndot
+- && firstcndot - wildcard == 1
+- && secondcndot - firstcndot > 1
+- && PORT_Strrchr(cn, '*') == wildcard
++ && firstcndot - wildcard == 1 /* wildcard is last char in first component */
++ && secondcndot - firstcndot > 1 /* second component is non-empty */
++ && PORT_Strrchr(cn, '*') == wildcard /* only one wildcard in cn */
+ && !PORT_Strncasecmp(cn, hn, wildcard - cn)
+- && !PORT_Strcasecmp(firstcndot, firsthndot)) {
++ && !PORT_Strcasecmp(firstcndot, firsthndot)
++ /* If hn starts with xn--, then cn must start with wildcard */
++ && (PORT_Strncasecmp(hn, "xn--", 4) || wildcard == cn)) {
+ /* valid wildcard pattern match */
+ return SECSuccess;
+ }
+--
+1.7.9.5
+
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index 404deccd8a..fbe4001f0e 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -18,6 +18,7 @@ SRC_URI = "\
file://nss-fix-incorrect-shebang-of-perl.patch \
file://nss-3.15.1-fix-CVE-2013-1741.patch \
file://nss-3.15.1-fix-CVE-2013-5605.patch \
+ file://nss-CVE-2014-1492.patch \
"
SRC_URI_append_class-target = "\
file://nss.pc.in \