summaryrefslogtreecommitdiff
path: root/dev-lang/python/files/python-3.3-CVE-2013-2099.patch
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-08-09 10:43:34 +0200
committerMichał Górny <mgorny@gentoo.org>2015-08-09 10:47:50 +0200
commit33cf38e4f1eb6b456df0874b34ff54a8961cf97e (patch)
tree41777587297a3b0614b5f2dd2deb5c727b53b228 /dev-lang/python/files/python-3.3-CVE-2013-2099.patch
parentafad29a8b43f1ccf53f95e95a9b12e430183f8bb (diff)
downloadgentoo-33cf38e4f1eb6b456df0874b34ff54a8961cf97e.tar.gz
gentoo-33cf38e4f1eb6b456df0874b34ff54a8961cf97e.tar.bz2
gentoo-33cf38e4f1eb6b456df0874b34ff54a8961cf97e.zip
Move 3.2 to ::python. Remove old patches.
Package-Manager: portage-2.2.20
Diffstat (limited to 'dev-lang/python/files/python-3.3-CVE-2013-2099.patch')
-rw-r--r--dev-lang/python/files/python-3.3-CVE-2013-2099.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/dev-lang/python/files/python-3.3-CVE-2013-2099.patch b/dev-lang/python/files/python-3.3-CVE-2013-2099.patch
deleted file mode 100644
index 44b9acede406..000000000000
--- a/dev-lang/python/files/python-3.3-CVE-2013-2099.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@pitrou.net>
-# Date 1368892602 -7200
-# Sat May 18 17:56:42 2013 +0200
-# Branch 3.3
-# Node ID c627638753e2d25a98950585b259104a025937a9
-# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d
-Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099).
-
-diff --git a/Lib/ssl.py b/Lib/ssl.py
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -129,9 +129,16 @@
- pass
-
-
--def _dnsname_to_pat(dn):
-+def _dnsname_to_pat(dn, max_wildcards=1):
- pats = []
- for frag in dn.split(r'.'):
-+ if frag.count('*') > max_wildcards:
-+ # Issue #17980: avoid denials of service by refusing more
-+ # than one wildcard per fragment. A survery of established
-+ # policy among SSL implementations showed it to be a
-+ # reasonable choice.
-+ raise CertificateError(
-+ "too many wildcards in certificate DNS name: " + repr(dn))
- if frag == '*':
- # When '*' is a fragment by itself, it matches a non-empty dotless
- # fragment.
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -349,6 +349,17 @@
- self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com')
- self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com')
-
-+ # Issue #17980: avoid denials of service by refusing more than one
-+ # wildcard per fragment.
-+ cert = {'subject': ((('commonName', 'a*b.com'),),)}
-+ ok(cert, 'axxb.com')
-+ cert = {'subject': ((('commonName', 'a*b.co*'),),)}
-+ ok(cert, 'axxb.com')
-+ cert = {'subject': ((('commonName', 'a*b*.com'),),)}
-+ with self.assertRaises(ssl.CertificateError) as cm:
-+ ssl.match_hostname(cert, 'axxbxxc.com')
-+ self.assertIn("too many wildcards", str(cm.exception))
-+
- def test_server_side(self):
- # server_hostname doesn't work for server sockets
- ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)