Need long ints not ints. A Python2 problem.

Author: Roland Hedberg

src/jwkest/ecc.py

@@ -3,6 +3,8 @@
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
+import six
+
 try:
     from builtins import object
 except ImportError:
@@ -68,12 +70,8 @@ def public_key_for(self, priv):
     # key
     def dh_z(self, priv, pub):
         return self.int2bytes( mulp(self.a, self.b, self.p, pub, priv)[0] )
-       
-    # ECDSA (adapted from ecdsa.py)
-    def sign(self, h, priv, k=None):
-        while h > self.N:
-            h >>= 1
-        r = s = 0
+
+    def _sign_loop(self, r, s, h, k, priv):
         while r == 0 or s == 0:
             if k is None:
                 k = (getrandbits(self.bits) % (self.N - 1)) + 1
@@ -83,7 +81,21 @@ def sign(self, h, priv, k=None):
             if r == 0:
                 continue
             s = (kinv * (h + r * priv)) % self.N
-        return self.int2bytes(r) + self.int2bytes(s) 
+        return r, s
+
+    # ECDSA (adapted from ecdsa.py)
+    def sign(self, h, priv, k=None):
+        while h > self.N:
+            h >>= 1
+
+        if six.PY2:
+            r = s = 0L
+        else:
+            r = s = 0
+
+        r, s = self._sign_loop(r, s, h, k, priv)
+
+        return self.int2bytes(r) + self.int2bytes(s)
 
     def verify(self, h, sig, pub):
         while h > self.N:

src/jwkest/jwk.py

@@ -396,6 +396,15 @@ def _split(self):
             self.d = self.key.d
         except AttributeError:
             pass
+        else:
+            for param in ["p", "q"]:
+                try:
+                    val = getattr(self.key, param)
+                except AttributeError:
+                    pass
+                else:
+                    if val:
+                        setattr(self, param, val)
 
     def load(self, filename):
         """

tests/test_1_jwt.py

@@ -34,5 +34,18 @@ def test_pack_unpack():
         "http://example.com/is_root"]
 
 
+def test_unpack_str():
+    _jwt = JWT(**{"alg": "none"})
+    payload = {"iss": "joe", "exp": 1300819380,
+               "http://example.com/is_root": True}
+    jwt = _jwt.pack(parts=[payload, ""])
+
+    jwt = jwt.decode('utf-8')
+
+    _jwt2 = JWT().unpack(jwt)
+    assert _jwt2
+    out_payload = _jwt2.payload()
+
+
 if __name__ == "__main__":
-    test_pack_unpack()
+    test_unpack_str()

tests/test_2_jwk.py

@@ -7,7 +7,10 @@
 import six
 from jwkest.ecc import P256
 from jwkest import long2intarr
-from jwkest.jwk import jwk_wrap, import_rsa_key_from_file, rsa_eq, keyrep
+from jwkest.jwk import jwk_wrap
+from jwkest.jwk import import_rsa_key_from_file
+from jwkest.jwk import rsa_eq
+from jwkest.jwk import keyrep
 from jwkest.jwk import KEYS
 from jwkest.jwk import base64url_to_long
 from jwkest.jwk import ECKey