Merge pull request #232 from asherf/crypto

Remove usage of deprecated Crypto library.

Author: asherf

jose/utils.py

@@ -3,48 +3,39 @@
 import struct
 import sys
 
-import six
-
-if sys.version_info > (3,):
-    # Deal with integer compatibilities between Python 2 and 3.
-    # Using `from builtins import int` is not supported on AppEngine.
-    long = int
-
 
 # Piggyback of the backends implementation of the function that converts a long
 # to a bytes stream. Some plumbing is necessary to have the signatures match.
+
 try:
-    from Crypto.Util.number import long_to_bytes
-except ImportError:
-    try:
-        from cryptography.utils import int_to_bytes as _long_to_bytes
+    from cryptography.utils import int_to_bytes as _long_to_bytes
 
-        def long_to_bytes(n, blocksize=0):
-            return _long_to_bytes(n, blocksize or None)
+    def long_to_bytes(n, blocksize=0):
+        return _long_to_bytes(n, blocksize or None)
 
-    except ImportError:
-        from ecdsa.ecdsa import int_to_string as _long_to_bytes
+except ImportError:
+    from ecdsa.ecdsa import int_to_string as _long_to_bytes
 
-        def long_to_bytes(n, blocksize=0):
-            ret = _long_to_bytes(n)
-            if blocksize == 0:
-                return ret
-            else:
-                assert len(ret) <= blocksize
-                padding = blocksize - len(ret)
-                return b'\x00' * padding + ret
+    def long_to_bytes(n, blocksize=0):
+        ret = _long_to_bytes(n)
+        if blocksize == 0:
+            return ret
+        else:
+            assert len(ret) <= blocksize
+            padding = blocksize - len(ret)
+            return b'\x00' * padding + ret
 
 
 def long_to_base64(data, size=0):
     return base64.urlsafe_b64encode(long_to_bytes(data, size)).strip(b'=')
 
 
 def int_arr_to_long(arr):
-    return long(''.join(["%02x" % byte for byte in arr]), 16)
+    return int(''.join(["%02x" % byte for byte in arr]), 16)
 
 
 def base64_to_long(data):
-    if isinstance(data, six.text_type):
+    if isinstance(data, str):
         data = data.encode("ascii")
 
     # urlsafe_b64decode will happily convert b64encoded data