Simplify wrapper, as digest_size is known in advance each time.

3 files changed, 9 insertions, 7 deletions

diff --git a/lib/Crypto/Hash/MD5.py b/lib/Crypto/Hash/MD5.py
index d9cf4b4..366cce2 100644
--- a/lib/Crypto/Hash/MD5.py
+++ b/lib/Crypto/Hash/MD5.py
@@ -38,17 +38,17 @@ def new(data=""):
     obj = Wrapper(hashFactory, data)
     obj.oid = oid
     obj.new = globals()['new']
+    if not hasattr(obj, 'digest_size'):
+        obj.digest_size = digest_size
     return obj
 
 try:
     # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
     import hashlib
     hashFactory = hashlib.md5
-    digest_size = new().digest_size
 
 except ImportError:
     import md5
     hashFactory = md5
-    if hasattr(md5, 'digestsize'):
-        digest_size = md5.digestsize
 
+digest_size = 16
diff --git a/lib/Crypto/Hash/SHA.py b/lib/Crypto/Hash/SHA.py
index d77a3c2..c806f09 100644
--- a/lib/Crypto/Hash/SHA.py
+++ b/lib/Crypto/Hash/SHA.py
@@ -38,17 +38,17 @@ def new(data=""):
     obj = Wrapper(hashFactory, data)
     obj.oid = oid
     obj.new = globals()['new']
+    if not hasattr(obj, 'digest_size'):
+        obj.digest_size = digest_size
     return obj
 
 try:
     # The sha module is deprecated in Python 2.6, so use hashlib when possible.
     import hashlib
     hashFactory = hashlib.sha1
-    digest_size = new().digest_size
 
 except ImportError:
     import sha
     hashFactory = sha
-    if hasattr(sha, 'digestsize'):
-        digest_size = sha.digestsize
 
+digest_size = 20
diff --git a/lib/Crypto/Util/wrapper.py b/lib/Crypto/Util/wrapper.py
index 9ef8a4e..479ae26 100644
--- a/lib/Crypto/Util/wrapper.py
+++ b/lib/Crypto/Util/wrapper.py
@@ -40,5 +40,7 @@ class Wrapper:
                 try:
                         return getattr(getattr(self,'_wrapped'),name)
                 except AttributeError:
-                        return getattr(self,name)
+                        if hasattr(self, name):
+                            return getattr(self,name)
+                        raise