Merge branch 'master' into py3_string

Conflicts:
	src/jwkest/jwk.py

Author: dallerbarn

doc/conf.py

@@ -28,7 +28,9 @@
 extensions = [
     'sphinx.ext.autodoc', 
     'sphinx.ext.coverage', 
-    'sphinx.ext.viewcode']
+    'sphinx.ext.viewcode',
+    'sphinx.ext.autosummary'
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

src/jwkest/jwk.py

@@ -15,7 +15,8 @@
 
 from requests import request
 
-from jwkest import base64url_to_long, as_bytes
+from jwkest import base64url_to_long
+from jwkest import as_bytes
 from jwkest import base64_to_long
 from jwkest import long_to_base64
 from jwkest import JWKESTException
@@ -446,8 +447,8 @@ class ECKey(Key):
     public_members = ["kty", "alg", "use", "kid", "crv", "x", "y"]
 
     def __init__(self, kty="EC", alg="", use="", kid="", key=None,
-                 crv="", x="", y="", d="", curve=None):
-        Key.__init__(self, kty, alg, use, kid, key)
+                 crv="", x="", y="", d="", curve=None, **kwargs):
+        Key.__init__(self, kty, alg, use, kid, key, **kwargs)
         self.crv = crv
         self.x = x
         self.y = y
@@ -533,8 +534,8 @@ class SYMKey(Key):
     public_members = members[:]
 
     def __init__(self, kty="oct", alg="", use="", kid="", key=None,
-                 x5c=None, x5t="", x5u="", k="", mtrl=""):
-        Key.__init__(self, kty, alg, use, kid, as_bytes(key), x5c, x5t, x5u)
+                 x5c=None, x5t="", x5u="", k="", mtrl="", **kwargs):
+        Key.__init__(self, kty, alg, use, kid, as_bytes(key), x5c, x5t, x5u, **kwargs)
         self.k = k
         if not self.key and self.k:
             if isinstance(self.k, str):

src/jwkest/jws.py

@@ -193,7 +193,7 @@ def verify(self, msg, sig, key):
 
     'PS256': PSSSigner(SHA256),
     'PS384': PSSSigner(SHA384),
-    'PS521': PSSSigner(SHA512),
+    'PS512': PSSSigner(SHA512),
 
     'none': None
 }

tests/test_3_jws.py

@@ -317,7 +317,7 @@ def test_signer_ps512():
     # Key has to be big enough  > 512+512+2
     keys = [RSAKey(key=import_rsa_key_from_file(full_path("./size2048.key")))]
     #keys[0]._keytype = "private"
-    _jws = JWS(payload, alg="PS521")
+    _jws = JWS(payload, alg="PS512")
     _jwt = _jws.sign_compact(keys)
 
     _rj = factory(_jwt)