From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 May 2014 22:42:29 +0000 (-0700)
Subject: link to wikipedia description of cryptographic salt
X-Git-Tag: v3.4.2rc1~497
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d81d80f6e4c61f008e5e379da0fbcbd41b3a3c5;p=thirdparty%2FPython%2Fcpython.git

link to wikipedia description of cryptographic salt
---

diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 661338e0e14f..cc982f631829 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -182,7 +182,7 @@ Key Derivation Function
 Key derivation and key stretching algorithms are designed for secure password
 hashing. Naive algorithms such as ``sha1(password)`` are not resistant against
 brute-force attacks. A good password hashing function must be tunable, slow, and
-include a salt.
+include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_.
 
 
 .. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None)