From db4309e19ad829635a84b6d3a002ce760c6f5dca Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 14 Sep 2013 09:08:09 +0200 Subject: Fix tkinter regression introduced by the security fix in #16248. --- Lib/tkinter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index a6ad888..1286779 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -1722,7 +1722,7 @@ class Tk(Misc, Wm): # ensure that self.tk is always _something_. self.tk = None if baseName is None: - import sys, os + import os baseName = os.path.basename(sys.argv[0]) baseName, ext = os.path.splitext(baseName) if ext not in ('.py', '.pyc', '.pyo'): -- cgit v0.12 From c5884d893033a5e16fb50bdde5cf42b07dc708f0 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 14 Sep 2013 09:09:18 +0200 Subject: Add NEWS entry for c18c18774e24. --- Misc/NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 4be9e00..4b576a1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2,6 +2,17 @@ Python News +++++++++++ +What's New in Python 3.2.6? +=========================== + +*Release date: TBD* + +Library +------- + +- Fix tkinter regression introduced by the security fix in issue #16248. + + What's New in Python 3.2.5? =========================== -- cgit v0.12 From bc75046bb3a8bd1e07547e99c8958c54ec16b9fb Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 14 Sep 2013 09:10:21 +0200 Subject: Add a NEWS entry for b9b521efeba3. --- Misc/NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 4b576a1..2b07ae3 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Library - Fix tkinter regression introduced by the security fix in issue #16248. +- Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of + service using certificates with many wildcards (CVE-2013-2099). + What's New in Python 3.2.5? =========================== -- cgit v0.12