Update to Python 3.8

Author: manns

pwm.default.setting

@@ -1,12 +1,12 @@
 {
-    "Algorithm": "md5", 
-    "CharacterSet": "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789`~!@#$%^&*()_-+={}|[]\\:\";'<>?,./", 
-    "LeetLvl": 1, 
-    "Length": 8, 
-    "Modifier": "", 
-    "Prefix": "", 
-    "Suffix": "", 
-    "URL": "", 
-    "UseLeet": "none", 
+    "Algorithm": "md5",
+    "CharacterSet": "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789`~!@#$%^&*()_-+={}|[]\\:\";'<>?,./",
+    "LeetLvl": 1,
+    "Length": 8,
+    "Modifier": "",
+    "Prefix": "",
+    "Suffix": "",
+    "URL": "",
+    "UseLeet": "none",
     "Username": ""
 }

pwmlib.py

@@ -58,7 +58,7 @@
 
 try:
     # Do we have pycrypto ? <http://www.amk.ca/python/code/crypto>
-    from Crypto.Hash import MD4, SHA256, RIPEMD
+    from Crypto.Hash import SHA256
     HAS_CRYPTO = True
 except ImportError:
     HAS_CRYPTO = False
@@ -94,12 +94,8 @@
 }
 
 CRYPTO_ALGORITHM_2_HASH_FUNC = {
-    "md4": "any_md4",
-    "hmac-md4": "any_hmac_md4",
     "sha256": "any_sha256",
     "hmac-sha256": "any_hmac_sha256",
-    "rmd160": "any_rmd160",
-    "hmac-rmd160": "any_hmac_rmd160",
 }
 
 if HAS_HASHLIB:
@@ -123,8 +119,7 @@ class PwmHashUtils(object):
     * algorithm: String
     \tOne valid algorithm out of "md5", "hmac-md5", "sha1", "hmac-sha1"
     \tIf hashlib is present also out of "sha256", "hmac-sha256"
-    \tIf pycrypto is present also out of "md4", "hmac-md4", "sha256",
-    \t"hmac-sha256", "rmd160", "hmac-rmd160"
+    \tIf pycrypto is present also out of "sha256", "hmac-sha256"
     * encoding: String
     \tCharacters that may appear in the generated password
 
@@ -264,26 +259,6 @@ def any_hmac_sha256(self, key, inp, trim=True):
             hashfunc = SHA256
         return self.rstr2any(hmac.new(key, inp, hashfunc).digest(), trim)
 
-    def any_md4(self, inp, trim=True):
-        """MD4 function wrapper"""
-
-        return self.rstr2any(MD4.new(inp).digest(), trim)
-
-    def any_hmac_md4(self, key, inp, trim=True):
-        """MD4 HMAC function wrapper"""
-
-        return self.rstr2any(hmac.new(key, inp, MD4).digest(), trim)
-
-    def any_rmd160(self, inp, trim=True):
-        """RMD160 function wrapper"""
-
-        return self.rstr2any(RIPEMD.new(inp).digest(), trim)
-
-    def any_hmac_rmd160(self, key, inp, trim=True):
-        """RMD160 HMAC function wrapper"""
-
-        return self.rstr2any(hmac.new(key, inp, RIPEMD).digest(), trim)
-
 
 @attr.s
 class PwmSettings(object):
@@ -305,8 +280,8 @@ class PwmSettings(object):
                          metadata=_mpw_metadata)
 
     _alg_metadata = {'cmd1': "-a", 'cmd2': "--alg", "guitext": "Algorithm",
-                     "help": "Hash algorithm [hmac-] md4/md5/sha1/sha256/"
-                             "rmd160 (default md5)"}
+                     "help": "Hash algorithm [hmac-] md5/sha1/sha256/"
+                             " (default md5)"}
     Algorithm = attr.ib(default="md5", validator=algorithm_val, type="alg",
                         metadata=_alg_metadata)
 

test_pwmlib_compare.py

@@ -80,9 +80,9 @@ def _generatepassword(self,
     def _get_cmd_args(self, params):
         """Returns command line arguments for given paramters"""
 
-        args = ["passwordmaker"]
+        args = ["./passwordmaker.py"]
 
-        halg = params["hashAlgorithm"].upper().replace("RMD160", "RIPEMD160")
+        halg = params["hashAlgorithm"].upper()
         if "HMAC-" in halg:
             args.append("--HMAC")
             halg = halg[5:]