diff options
| author | Dwayne Litzenberger <dlitz@dlitz.net> | 2013-02-17 09:44:43 -0800 |
|---|---|---|
| committer | Dwayne Litzenberger <dlitz@dlitz.net> | 2013-02-17 09:44:54 -0800 |
| commit | 3e0afc7ae36080ace1486e8a0ee8aa0ed25b9a3b (patch) | |
| tree | d6dc2c39d336047061e886515c22078b7c03d1e8 | |
| parent | 18137d0e42d760efa6428ff8e68e2ed865cb6a70 (diff) | |
| download | pycrypto-3e0afc7ae36080ace1486e8a0ee8aa0ed25b9a3b.tar.gz | |
Hash: Rename SHA->SHA1 and RIPEMD->RIPEMD160 (pct-speedtest.py)
Oops, I missed this one.
| -rw-r--r-- | pct-speedtest.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pct-speedtest.py b/pct-speedtest.py index eb2778f..2757d7f 100644 --- a/pct-speedtest.py +++ b/pct-speedtest.py @@ -29,9 +29,14 @@ import sys from Crypto.PublicKey import RSA from Crypto.Cipher import AES, ARC2, ARC4, Blowfish, CAST, DES3, DES, XOR -from Crypto.Hash import HMAC, MD2, MD4, MD5, SHA, SHA224, SHA256, SHA384, SHA512 +from Crypto.Hash import HMAC, MD2, MD4, MD5, SHA224, SHA256, SHA384, SHA512 from Crypto.Random import get_random_bytes try: + from Crypto.Hash import SHA1 +except ImportError: + # Maybe it's called SHA + from Crypto.Hash import SHA as SHA1 +try: from Crypto.Hash import RIPEMD160 except ImportError: # Maybe it's called RIPEMD @@ -221,7 +226,7 @@ class Benchmark: ("MD2", MD2), ("MD4", MD4), ("MD5", MD5), - ("SHA", SHA), + ("SHA1", SHA1), ("SHA224", SHA224), ("SHA256", SHA256), ("SHA384", SHA384), |