Merge branch 'master' of github.com:IdentityPython/cryptojwt

Author: rohe

src/cryptojwt/jwk.py

@@ -396,17 +396,23 @@ def serialize(self, private=False):
         """
         pass
 
-    def get_key(self, **kwargs):
+    def get_key(self, private=False):
         """
         Get a keys useful for signing and/or encrypting information.
 
-        :param kwargs:
+        :param private: Private key requested
         :return: A key instance. This can be an RSA, EC or other
         type of key.
         """
         if not self.key:
             self.deserialize()
 
+        if not private and hasattr(self.key, 'public_key'):
+            return self.key.public_key()
+
+        if private and not hasattr(self.key, 'private_bytes'):
+            raise ValueError("Not a private key")
+
         return self.key
 
     def verify(self):
@@ -1026,6 +1032,11 @@ def serialize(self, private=True):
         res["k"] = as_unicode(b64e(bytes(self.key)))
         return res
 
+    def get_key(self, **kwargs):
+        if not self.key:
+            self.deserialize()
+        return self.key
+
     def encryption_key(self, alg, **kwargs):
         """
         Return an encryption key as per

tests/test_2_jwk.py

@@ -294,6 +294,23 @@ def test_keys():
     assert len(keyl['ec']) == 1
 
 
+def test_get_key():
+    ec_key = generate_private_key(NIST2SEC['P-256'], default_backend())
+    asym_private_key = ECKey(key=ec_key)
+    asym_public_key = ECKey(key=asym_private_key.key.public_key())
+    sym_key = SYMKey(key='mekmitasdigoat', kid='xyzzy')
+
+    asym_private_key.get_key(private=True)
+    asym_private_key.get_key(private=False)
+
+    with pytest.raises(ValueError):
+        asym_public_key.get_key(private=True)
+    asym_public_key.get_key(private=False)
+
+    sym_key.get_key(private=True)
+    sym_key.get_key(private=False)
+
+
 def test_private_key_from_jwk():
     keys = []