Change soem usages of to_dict() to serialize() which makes sure no private information is divulged unless asked for.

Author: Roland Hedberg

src/jwkest/jwk.py

@@ -222,6 +222,11 @@ def __init__(self, kty="", alg="", use="", kid="", key=None, x5c=None,
         self.inactive_since = 0
 
     def to_dict(self):
+        """
+        A wrapper for to_dict the makes sure that all the private information
+        as well as extra arguments are included. This method should *not* be
+        used for exporting information about the key.
+        """
         res = self.serialize(private=True)
         res.update(self.extra_args)
         return res
@@ -249,7 +254,7 @@ def deserialize(self):
     def serialize(self, private=False):
         """
         map key characteristics into attribute values that can be used
-        to create an on-the-wire represntation of the key
+        to create an on-the-wire representation of the key
         """
         pass
 

src/jwkest/jws.py

@@ -308,9 +308,9 @@ def headers(self, extra=None):
                     pass
 
         if "jwk" in self:
-            _header["jwk"] = self["jwk"].to_dict()
+            _header["jwk"] = self["jwk"].serialize()
         elif "jwk" in _extra:
-            _header["jwk"] = extra["jwk"].to_dict()
+            _header["jwk"] = extra["jwk"].serialize()
 
         if "kid" in self:
             try:

tests/test_3_jws.py

@@ -287,7 +287,7 @@ def test_a_1_3b():
 def test_jws_1():
     msg = {"iss": "joe", "exp": 1300819380, "http://example.com/is_root": True}
     key = SYMKey(key=jwkest.intarr2bin(HMAC_KEY))
-    _jws = JWS(msg, cty="JWT", alg="HS256", jwk=key.to_dict())
+    _jws = JWS(msg, cty="JWT", alg="HS256", jwk=key.serialize())
     res = _jws.sign_compact()
 
     _jws2 = JWS(alg="HS256")