Changeset 792 for ZMS/trunk/ZMSGlobals.py

Timestamp:

16.11.2009 15:43:14 (3 years ago)

Author:

cmeier

Message:

zms-2.12.0-01

File:

• ZMS/trunk/ZMSGlobals.py (modified) (2 diffs)

ZMS/trunk/ZMSGlobals.py

@@ -34 +34 @@
 import base64
 import copy
-import md5
 import operator
 import os
@@ -52 +51 @@
 __all__= ['ZMSGlobals']
 
-
 # ------------------------------------------------------------------------------
 #  MD5:
 # ------------------------------------------------------------------------------
-class MD5DigestScheme:
+try: # Python >= 2.5
+  import hashlib
+
+  class MD5DigestScheme:
 
     def encrypt(self, pw):
-        enc = md5.new(pw)
-        enc = enc.hexdigest()
-        return enc
+      enc = hashlib.md5(pw)
+      enc = enc.hexdigest()
+      return enc
 
     def validate(self, reference, attempt):
-        compare = self.encrypt(attempt)[:-1]
-        return (compare == reference)
+      compare = self.encrypt(attempt)[:-1]
+      return (compare == reference)
+
+except: # Python < 2.5
+  import md5
+
+  class MD5DigestScheme:
+
+    def encrypt(self, pw):
+      enc = md5.new(pw)
+      enc = enc.hexdigest()
+      return enc
+
+    def validate(self, reference, attempt):
+      compare = self.encrypt(attempt)[:-1]
+      return (compare == reference)
 
 AuthEncoding.registerScheme('MD5', MD5DigestScheme())