diff options
| author | Dwayne Litzenberger <dlitz@dlitz.net> | 2013-02-16 16:06:32 -0800 |
|---|---|---|
| committer | Dwayne Litzenberger <dlitz@dlitz.net> | 2013-02-16 16:20:23 -0800 |
| commit | 755375bb7d866a01e19153f5809772f4474eb94d (patch) | |
| tree | b8abee5c8e7c529330cfe371a318075df2a86b28 /lib/Crypto/Cipher | |
| parent | 7f5b9415346ea5849e8f6becbafcef8a48cf1b8f (diff) | |
| download | pycrypto-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 'lib/Crypto/Cipher')
| -rw-r--r-- | lib/Crypto/Cipher/PKCS1_OAEP.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Crypto/Cipher/PKCS1_OAEP.py b/lib/Crypto/Cipher/PKCS1_OAEP.py index 9afe176..f0754e4 100644 --- a/lib/Crypto/Cipher/PKCS1_OAEP.py +++ b/lib/Crypto/Cipher/PKCS1_OAEP.py @@ -55,7 +55,7 @@ __revision__ = "$Id$" __all__ = [ 'new', 'PKCS1OAEP_Cipher' ] import Crypto.Signature.PKCS1_PSS -import Crypto.Hash.SHA +import Crypto.Hash.SHA1 from Crypto.Util.py3compat import * import Crypto.Util.number @@ -75,7 +75,7 @@ class PKCS1OAEP_Cipher: hashAlgo : hash object The hash function to use. This can be a module under `Crypto.Hash` or an existing hash object created from any of such modules. If not specified, - `Crypto.Hash.SHA` (that is, SHA-1) is used. + `Crypto.Hash.SHA1` is used. mgfunc : callable A mask generation function that accepts two parameters: a string to use as seed, and the lenth of the mask to generate, in bytes. @@ -93,7 +93,7 @@ class PKCS1OAEP_Cipher: if hashAlgo: self._hashObj = hashAlgo else: - self._hashObj = Crypto.Hash.SHA + self._hashObj = Crypto.Hash.SHA1 if mgfunc: self._mgf = mgfunc @@ -238,7 +238,7 @@ def new(key, hashAlgo=None, mgfunc=None, label=b('')): hashAlgo : hash object The hash function to use. This can be a module under `Crypto.Hash` or an existing hash object created from any of such modules. If not specified, - `Crypto.Hash.SHA` (that is, SHA-1) is used. + `Crypto.Hash.SHA1` is used. mgfunc : callable A mask generation function that accepts two parameters: a string to use as seed, and the lenth of the mask to generate, in bytes. |