From 0ccff4d3e10af0d1c7ddba8e1b60526578c6718a Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 26 May 2014 15:41:26 -0700 Subject: [PATCH 1/2] oxford comma --- Doc/library/hashlib.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index d27902e3c27..661338e0e14 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -180,9 +180,9 @@ 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. +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. .. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None) From 0d81d80f6e4c61f008e5e379da0fbcbd41b3a3c5 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 26 May 2014 15:42:29 -0700 Subject: [PATCH 2/2] link to wikipedia description of cryptographic salt --- Doc/library/hashlib.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 661338e0e14..cc982f63182 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 `_. .. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None)