Ticket #1076: 0001-REF-Do-not-use-deprecated-md5-sha-modules.patch

indico/MaKaC/export/oai2.py

@@ -28 +28 @@
 from string import split
 import re
 import time
-import md5
+import hashlib
 from datetime import datetime
 from pytz import timezone
 
@@ -1310 +1310 @@
     def OAIGenResumptionToken(self):
         "Generates unique ID for resumption token management."
 
-        return md5.new(str(time.time())).hexdigest()
+        return hashlib.md5(str(time.time())).hexdigest()
 
 
     def OAICacheIn(self, resumptionToken, sysnos):

indico/MaKaC/services/interface/rpc/description.py

@@ -1 +1 @@
 from MaKaC.common import Config
 
-import sha
+import hashlib
 
 def fetchClasses(module, namespace):
     table = {}
@@ -52 +52 @@
     from MaKaC.services.interface.rpc import handlers
 
     # a unique identifier for the service
-    shaObj = sha.new(Config.getInstance().getBaseURL())
+    shaObj = hashlib.sha1(Config.getInstance().getBaseURL())
     jsonRpcServiceId = shaObj.hexdigest()
     # endpoint
     jsonRpcServiceURL = Config.getInstance().getBaseURL() + '/services/json-rpc/'

indico/MaKaC/webinterface/session/base.py

@@ -111 +111 @@
 
 except IOError:
     # this is much less secure than the above function
-    import sha
-    _randstate = sha.new(str(time() + clock()))
+    import hashlib
+    _randstate = hashlib.sha1(str(time() + clock()))
     def randlong(bytes):
         """Return bits of random data as a long integer."""
         global _randstate