summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-09-19 21:30:21 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-09-19 21:30:21 (GMT)
commit004c00b7f4e0005cdedf373dc0a183ee98f92c87 (patch)
tree940c4e1753a8e7d1c684870eb293736c2fc79d9b /Doc/whatsnew
parenta5c85b3f5fc12256680a93dda9d32138d47605de (diff)
parentcbfaa7b9d3174d6304ec3b5ab165b5c3514c5d34 (diff)
downloadcpython-004c00b7f4e0005cdedf373dc0a183ee98f92c87.zip
cpython-004c00b7f4e0005cdedf373dc0a183ee98f92c87.tar.gz
cpython-004c00b7f4e0005cdedf373dc0a183ee98f92c87.tar.bz2
merge 3.4
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/2.7.rst27
1 files changed, 18 insertions, 9 deletions
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index a622496..bb26c76 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -2548,22 +2548,31 @@ with the first of those changes appearing in the Python 2.7.7 release.
:pep:`466` related features added in Python 2.7.7:
* :func:`hmac.compare_digest` was backported from Python 3 to make a timing
- attack resistant comparison operation broadly available to Python 2
- applications (backported by Alex Gaynor in :issue:`21306`)
-
-* upgraded to OpenSSL 1.0.1g for the prebuilt Windows installers published
- on python.org (contributed by Zachary Ware in :issue:`21462`)
+ attack resistant comparison operation available to Python 2 applications.
+ (Contributed by Alex Gaynor; :issue:`21306`.)
+* OpenSSL 1.0.1g was upgraded in the official Windows installers published on
+ python.org. (Contributed by Zachary Ware; :issue:`21462`.)
:pep:`466` related features added in Python 2.7.8:
* :func:`hashlib.pbkdf2_hmac` was backported from Python 3 to make a hashing
algorithm suitable for secure password storage broadly available to Python
- 2 applications (backported by Alex Gaynor in :issue:`21304`)
+ 2 applications. (Contributed by Alex Gaynor; :issue:`21304`.)
+
+* OpenSSL 1.0.1h was upgraded for the official Windows installers published on
+ python.org. (contributed by Zachary Ware in :issue:`21671` for CVE-2014-0224)
+
+:pep:`466` related features added in Python 2.7.9:
+
+* Most of Python 3.4's :mod:`ssl` module was backported. This means :mod:`ssl`
+ now supports Server Name Indication, TLS1.x settings, access to the platform
+ certificate store, the :class:`~ssl.SSLContext` class, and other
+ features. (Contributed by Alex Gaynor and David Reid; :issue:`21308`.)
-* upgraded to OpenSSL 1.0.1h for the prebuilt Windows installers published
- on python.org (contributed by Zachary Ware in :issue:`21671` for
- CVE-2014-0224)
+* :func:`os.urandom` was changed to cache a file descriptor to ``/dev/urandom``
+ instead of reopening ``/dev/urandom`` on every call. (Contributed by Alex
+ Gaynor; :issue:`21305`.)
.. ======================================================================