summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorDwayne Litzenberger <dlitz@dlitz.net>2013-02-16 16:06:32 -0800
committerDwayne Litzenberger <dlitz@dlitz.net>2013-02-16 16:20:23 -0800
commit755375bb7d866a01e19153f5809772f4474eb94d (patch)
treeb8abee5c8e7c529330cfe371a318075df2a86b28 /Doc
parent7f5b9415346ea5849e8f6becbafcef8a48cf1b8f (diff)
downloadpycrypto-755375bb7d866a01e19153f5809772f4474eb94d.tar.gz
Hash: Rename SHA->SHA1 and RIPEMD->RIPEMD160 (1/2)
These algorithm names were confusing, because there are actually algorithms called "SHA" (a.k.a. SHA-0) and "RIPEMD" (the original version). This commit just renames the modules, with no backward-compatibility support.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/pycrypt.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/pycrypt.rst b/Doc/pycrypt.rst
index 2a48f4c..f8df9fb 100644
--- a/Doc/pycrypt.rst
+++ b/Doc/pycrypt.rst
@@ -117,8 +117,8 @@ Hash function Digest length Security
MD2 128 bits Insecure, do not use
MD4 128 bits Insecure, do not use
MD5 128 bits Insecure, do not use
-RIPEMD 160 bits Secure. This is RIPEMD-160.
-SHA 160 bits SHA1 is shaky. Walk, do not run, away from SHA1.
+RIPEMD160 160 bits Secure.
+SHA1 160 bits SHA1 is shaky. Walk, do not run, away from SHA1.
SHA256 256 bits Secure.
============= ============= ========
@@ -1069,7 +1069,7 @@ with ASCII. Unfortunately, it's difficult for humans to remember 16
or 32 hex digits.
One solution is to request a lengthy passphrase from the user, and
-then run it through a hash function such as SHA or MD5. Another
+then run it through a hash function such as SHA1 or MD5. Another
solution is discussed in RFC 1751, "A Convention for Human-Readable
128-bit Keys", by Daniel L. McDonald. Binary keys are transformed
into a list of short English words that should be easier to remember.