Changeset 5837

Timestamp:

May 22, 2009, 9:40:05 AM (15 years ago)

Author:

Matt Good

Message:

Use hashlib when available (fixes #4984)

Location:

accountmanagerplugin/trunk/acct_mgr

Files:

• hashlib_compat.py (added)
• md5crypt.py (modified) (2 diffs)
• pwhash.py (modified) (3 diffs)

accountmanagerplugin/trunk/acct_mgr/md5crypt.py

@@ -12 +12 @@
 # This port adds no further stipulations.  I forfeit any copyright interest.
 
-import md5
+from hashlib_compat import md5
 
 def md5crypt(password, salt, magic='$1$'):
     # /* The password first, since that is what is most unknown */ /* Then our magic string */ /* Then the raw salt */
-    m = md5.new()
+    m = md5()
     m.update(password + magic + salt)
 
     # /* Then just as many characters of the MD5(pw,salt,pw) */
-    mixin = md5.md5(password + salt + password).digest()
+    mixin = md5(password + salt + password).digest()
     for i in range(0, len(password)):
         m.update(mixin[i % 16])
@@ -38 +38 @@
     # /* and now, just to make sure things don't run too fast */
     for i in range(1000):
-        m2 = md5.md5()
+        m2 = md5()
         if i & 1:
             m2.update(password)

accountmanagerplugin/trunk/acct_mgr/pwhash.py

@@ -11 +11 @@
 
 from binascii import hexlify
-import md5, sha
+from hashlib_compat import md5, sha1
 
 from trac.core import *
@@ -81 +81 @@
         return md5crypt(password, salt_[6:].split('$')[0], '$apr1$')
     elif salt_.startswith('{SHA}'):
-        return '{SHA}' + sha.new(password).digest().encode('base64')[:-1]
+        return '{SHA}' + sha1(password).digest().encode('base64')[:-1]
     elif crypt is None:
         # crypt passwords are only supported on Unix-like systems
@@ -91 +91 @@
 def htdigest(user, realm, password):
     p = ':'.join([user, realm, password])
-    return md5.new(p).hexdigest()
+    return md5(p).hexdigest()