Merge pull request #41 from rebeckag/rsa_key_private_serialization

Private RSA key serialization

Author: Roland Hedberg

src/jwkest/jwk.py

@@ -222,7 +222,7 @@ def __init__(self, kty="", alg="", use="", kid="", key=None, x5c=None,
         self.inactive_since = 0
 
     def to_dict(self):
-        res = self.serialize()
+        res = self.serialize(private=True)
         res.update(self.extra_args)
         return res
 
@@ -384,10 +384,18 @@ def serialize(self, private=False):
             raise SerializationNotPossible()
 
         res = self.common()
-        for param in self.longs:
+
+        public_longs = list(set(self.public_members) & set(self.longs))
+        for param in public_longs:
             item = getattr(self, param)
             if item:
                 res[param] = long_to_base64(item)
+
+        if private:
+            for param in self.longs:
+                item = getattr(self, param)
+                if item:
+                    res[param] = long_to_base64(item)
         return res
 
     def _split(self):
@@ -479,7 +487,7 @@ def deserialize(self):
         self.curve = NISTEllipticCurve.by_name(self.crv)
         if self.d:
             try:
-                if isinstance(self.d, str):
+                if isinstance(self.d, six.string_types):
                     self.d = deser(self.d)
             except ValueError as err:
                 raise DeSerializationNotPossible(str(err))

tests/test_2_jwk.py

@@ -206,7 +206,7 @@ def test_serialize_rsa_priv_key():
 def test_import_export_eckey():
     _key = ECKey(**ECKEY)
     _key.deserialize()
-    assert _eq(list(_key.keys()), ["y", "x", "crv", "kty"])
+    assert _eq(list(_key.keys()), ["y", "x", "d", "crv", "kty"])
 
 
 def test_create_eckey():

tox.ini

@@ -11,3 +11,6 @@ commands=py.test tests/
 deps=pytest
      pycrypto
      requests
+
+[pep8]
+max-line-length=100