summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-02-26 18:07:21 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-02-26 18:07:21 (GMT)
commit9251d59523f64fa789c5ec4e68290644fbde1021 (patch)
tree91872a1c01c37fa1c38eab2fcf5cd0e6f46029ae
parentd2d81f016348b359888e7198371d7597aa8831b0 (diff)
downloadcpython-9251d59523f64fa789c5ec4e68290644fbde1021.zip
cpython-9251d59523f64fa789c5ec4e68290644fbde1021.tar.gz
cpython-9251d59523f64fa789c5ec4e68290644fbde1021.tar.bz2
whatsnew: expand pbkdf2_hmac entry slightly.
-rw-r--r--Doc/whatsnew/3.4.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index f9e5b2a..997afc4 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -757,8 +757,10 @@ dictionaries containing the collections statistics since interpreter startup.
hashlib
-------
-New :func:`hashlib.pbkdf2_hmac` function. (Contributed by Christian Heimes in
-:issue:`18582`)
+A new :func:`hashlib.pbkdf2_hmac` function provides
+the `PKCS#5 password-based key derivation function 2
+<http://en.wikipedia.org/wiki/PBKDF2>`_. (Contributed by Christian
+Heimes in :issue:`18582`)
The :attr:`~hashlib.hash.name` attribute of :mod:`hashlib` hash objects is now
a formally supported interface. It has always existed in CPython's