Changed from pycrypto to pycryptodome.

Author: Roland Hedberg

setup.py

@@ -41,7 +41,7 @@
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.4"],
-    install_requires=["pycrypto >= 2.6.1", "requests", "six", "future"],
+    install_requires=["pycryptodome", "requests", "six", "future"],
     tests_require=['pytest'],
     zip_safe=False,
     scripts=glob.glob('script/*.py'),

src/jwkest/__init__.py

@@ -14,7 +14,7 @@
 
 from binascii import unhexlify
 
-__version__ = "1.0.11b0"
+__version__ = "1.1.0"
 
 logger = logging.getLogger(__name__)
 

src/jwkest/aes_key_wrap.py

@@ -16,6 +16,7 @@
 PyCrypto's AES.
 """
 from __future__ import division
+from Crypto.Cipher.AES import MODE_ECB
 
 try:
     from builtins import hex
@@ -28,12 +29,12 @@
 QUAD = struct.Struct('>Q')
 
 
-def aes_unwrap_key_and_iv(kek, wrapped):
+def aes_unwrap_key_and_iv(kek, wrapped, mode=MODE_ECB):
     n = (len(wrapped) // 8) - 1
     #NOTE: R[0] is never accessed, left in for consistency with RFC indices
     r = [None] + [wrapped[i * 8:i * 8 + 8] for i in range(1, n + 1)]
     a = QUAD.unpack(wrapped[:8])[0]
-    decrypt = AES.new(kek).decrypt
+    decrypt = AES.new(kek, mode).decrypt
     for j in range(5, -1, -1):  #counting down
         for i in range(n, 0, -1):  #(n, n-1, ..., 1)
             ciphertext = QUAD.pack(a ^ (n * j + i)) + r[i]
@@ -62,11 +63,11 @@ def aes_unwrap_key_withpad(kek, wrapped):
     return key[:key_len]
 
 
-def aes_wrap_key(kek, plaintext, iv=0xa6a6a6a6a6a6a6a6):
+def aes_wrap_key(kek, plaintext, iv=0xa6a6a6a6a6a6a6a6, mode=MODE_ECB):
     n = len(plaintext) // 8
     r = [None] + [plaintext[i * 8:i * 8 + 8] for i in range(0, n)]
     a = iv
-    encrypt = AES.new(kek).encrypt
+    encrypt = AES.new(kek, mode).encrypt
     for j in range(6):
         for i in range(1, n + 1):
             b = encrypt(QUAD.pack(a) + r[i])

src/jwkest/elliptic.py

@@ -349,17 +349,19 @@ def y_from_x(x, p, q, n, sign):
 
 
 if __name__ == "__main__":
-    import rsa
+    from Crypto.Random.random import randint
+    from Crypto.Util.number import getPrime
     import time
 
     t = time.time()
-    n = rsa.get_prime(256 / 8, 20)
+    n = getPrime(int(256/8))
+    #n = rsa.get_prime(256 / 8, 20)
     tp = time.time() - t
-    p = rsa.random.randint(1, n)
-    p1 = (rsa.random.randint(1, n), rsa.random.randint(1, n))
+    p = randint(1, n)
+    p1 = (randint(1, n), randint(1, n))
     q = curve_q(p1[0], p1[1], p, n)
-    r1 = rsa.random.randint(1, n)
-    r2 = rsa.random.randint(1, n)
+    r1 = randint(1, n)
+    r2 = randint(1, n)
     q1 = mulp(p, q, n, p1, r1)
     q2 = mulp(p, q, n, p1, r2)
     s1 = mulp(p, q, n, q1, r2)
@@ -368,14 +370,15 @@ def y_from_x(x, p, q, n, sign):
     tt = time.time() - t
 
     def test(tcount, bits=256):
-        n = rsa.get_prime(bits / 8, 20)
-        p = rsa.random.randint(1, n)
-        p1 = (rsa.random.randint(1, n), rsa.random.randint(1, n))
+        n = getPrime(int(bits/8))
+        #n = rsa.get_prime(bits / 8, 20)
+        p = randint(1, n)
+        p1 = (randint(1, n), randint(1, n))
         q = curve_q(p1[0], p1[1], p, n)
-        p2 = mulp(p, q, n, p1, rsa.random.randint(1, n))
+        p2 = mulp(p, q, n, p1, randint(1, n))
 
-        c1 = [rsa.random.randint(1, n) for i in range(tcount)]
-        c2 = [rsa.random.randint(1, n) for i in range(tcount)]
+        c1 = [randint(1, n) for i in range(tcount)]
+        c2 = [randint(1, n) for i in range(tcount)]
         c = list(zip(c1, c2))
 
         t = time.time()

src/jwkest/jwk.py

@@ -10,7 +10,7 @@
 
 from Crypto.PublicKey import RSA
 from Crypto.PublicKey.RSA import importKey
-from Crypto.PublicKey.RSA import _RSAobj
+from Crypto.PublicKey.RSA import RsaKey
 from Crypto.Util.asn1 import DerSequence
 
 from requests import request
@@ -110,6 +110,7 @@ def der2rsa(der):
 def pem_cert2rsa(pem_file):
     # Convert from PEM to DER
     pem = open(pem_file).read()
+    _rsa = RSA.importKey(pem)
     lines = pem.replace(" ", '').split()
     return der2rsa(a2b_base64(''.join(lines[1:-1])))
 
@@ -648,7 +649,7 @@ def jwk_wrap(key, use="", kid=""):
     :param kid: A key id
     :return: The Key instance
     """
-    if isinstance(key, _RSAobj):
+    if isinstance(key, RsaKey):
         kspec = RSAKey(use=use, kid=kid).load_key(key)
     elif isinstance(key, str):
         kspec = SYMKey(key=key, use=use, kid=kid)

tests/test_0_jwkest.py

@@ -1,7 +1,9 @@
 import base64
 import os
 import struct
-from jwkest import long2intarr, b64d, b64e
+from jwkest import long2intarr
+from jwkest import b64d
+from jwkest import b64e
 from jwkest import intarr2long
 from jwkest import base64_to_long
 from jwkest import long_to_base64

tests/test_2_jwk.py

@@ -3,7 +3,7 @@
 from collections import Counter
 import json
 from Crypto.PublicKey import RSA
-from Crypto.PublicKey.RSA import _RSAobj
+from Crypto.PublicKey.RSA import RsaKey
 import struct
 import six
 from jwkest.ecc import P256
@@ -65,7 +65,7 @@ def test_urlsafe_base64decode():
 
 def test_pem_cert2rsa():
     _ckey = pem_cert2rsa(CERT)
-    assert isinstance(_ckey, _RSAobj)
+    assert isinstance(_ckey, RsaKey)
 
 
 def test_extract_rsa_from_cert_2():
@@ -160,12 +160,12 @@ def test_load_jwk():
     assert len(keylist1) == 1
     key = keylist1["rsa"][0]
     assert key.kty == 'RSA'
-    assert isinstance(key.key, _RSAobj)
+    assert isinstance(key.key, RsaKey)
 
 
 def test_import_rsa_key():
     _ckey = RSA.importKey(open(full_path(KEY), 'r').read())
-    assert isinstance(_ckey, _RSAobj)
+    assert isinstance(_ckey, RsaKey)
     djwk = jwk_wrap(_ckey).to_dict()
     print(djwk)
     assert _eq(djwk.keys(), ["kty", "e", "n", "p", "q", "d"])

tests/test_4_jwe.py

@@ -1,8 +1,9 @@
-from __future__ import print_function
-import array
+#from __future__ import print_function
 import hashlib
 import os
 import sys
+import array
+
 from Crypto.PublicKey import RSA
 
 from jwkest.aes_gcm import AES_GCM