Merge pull request #61 from IdentityPython/rsa_import

Work around bad RSAKey import

Author: jschlyter

src/cryptojwt/jwe/__init__.py

@@ -22,7 +22,14 @@
         "ECDH-ES+A192KW",
         "ECDH-ES+A256KW",
     ],
-    "enc": ["A128CBC-HS256", "A192CBC-HS384", "A256CBC-HS512", "A128GCM", "A192GCM", "A256GCM",],
+    "enc": [
+        "A128CBC-HS256",
+        "A192CBC-HS384",
+        "A256CBC-HS512",
+        "A128GCM",
+        "A192GCM",
+        "A256GCM",
+    ],
 }
 
 

src/cryptojwt/jwe/aes.py

@@ -18,8 +18,7 @@
 
 
 class AES_CBCEncrypter(Encrypter):
-    """
-    """
+    """"""
 
     def __init__(self, key_len=32, key=None, msg_padding="PKCS7"):
         Encrypter.__init__(self)

src/cryptojwt/jwe/jwe_ec.py

@@ -157,7 +157,12 @@ def dec_setup(self, token, key=None, **kwargs):
                 raise Exception("Unknown key length for algorithm")
 
             self.cek = ecdh_derive_key(
-                key, epubkey.pub_key, apu, apv, str(self.headers["enc"]).encode(), dk_len,
+                key,
+                epubkey.pub_key,
+                apu,
+                apv,
+                str(self.headers["enc"]).encode(),
+                dk_len,
             )
         elif self.headers["alg"] in [
             "ECDH-ES+A128KW",

src/cryptojwt/jwe/jwe_rsa.py

@@ -85,7 +85,7 @@ def encrypt(self, key, iv="", cek="", **kwargs):
         return jwe.pack(parts=[jwe_enc_key, iv, ctxt, tag])
 
     def decrypt(self, token, key, cek=None):
-        """ Decrypts a JWT
+        """Decrypts a JWT
 
         :param token: The JWT
         :param key: A key to use for decrypting

src/cryptojwt/jwe/jwekey.py

@@ -38,7 +38,7 @@ def alg2keytype(self, alg):
         return alg2keytype(alg)
 
     def enc_setup(self, enc_alg, msg, auth_data=b"", key=None, iv=""):
-        """ Encrypt JWE content.
+        """Encrypt JWE content.
 
         :param enc_alg: The JWE "enc" value specifying the encryption algorithm
         :param msg: The plain text message
@@ -62,7 +62,7 @@ def enc_setup(self, enc_alg, msg, auth_data=b"", key=None, iv=""):
 
     @staticmethod
     def _decrypt(enc, key, ctxt, iv, tag, auth_data=b""):
-        """ Decrypt JWE content.
+        """Decrypt JWE content.
 
         :param enc: The JWE "enc" value specifying the encryption algorithm
         :param key: Key (CEK)

src/cryptojwt/jwe/rsa.py

@@ -20,7 +20,9 @@ def encrypt(self, msg, key, sign_padding="pkcs1_padding"):
         return key.encrypt(
             msg,
             _padding(
-                mgf=padding.MGF1(algorithm=_chosen_hash()), algorithm=_chosen_hash(), label=None,
+                mgf=padding.MGF1(algorithm=_chosen_hash()),
+                algorithm=_chosen_hash(),
+                label=None,
             ),
         )
 

src/cryptojwt/jwk/jwk.py

@@ -93,7 +93,9 @@ def key_from_jwk_dict(jwk_dict, private=None):
         else:
             # Ecdsa public key.
             ec_pub_numbers = ec.EllipticCurvePublicNumbers(
-                base64url_to_long(_jwk_dict["x"]), base64url_to_long(_jwk_dict["y"]), curve,
+                base64url_to_long(_jwk_dict["x"]),
+                base64url_to_long(_jwk_dict["y"]),
+                curve,
             )
             _jwk_dict["pub_key"] = ec_pub_numbers.public_key(backends.default_backend())
         return ECKey(**_jwk_dict)

src/cryptojwt/jwk/rsa.py

@@ -128,7 +128,7 @@ def rsa_eq(key1, key2):
 
 
 def x509_rsa_load(txt):
-    """ So I get the same output format as loads produces
+    """So I get the same output format as loads produces
     :param txt:
     :return:
     """
@@ -172,10 +172,10 @@ def rsa_construct_private(numbers):
     try:
         cnum["iqmp"] = numbers["di"]
     except KeyError:
-        cnum["iqmp"] = rsa.rsa_crt_iqmp(cnum["p"], cnum["p"])
+        cnum["iqmp"] = rsa.rsa_crt_iqmp(cnum["p"], cnum["q"])
     else:
         if not numbers["di"]:
-            cnum["iqmp"] = rsa.rsa_crt_iqmp(cnum["p"], cnum["p"])
+            cnum["iqmp"] = rsa.rsa_crt_iqmp(cnum["p"], cnum["q"])
 
     rpubn = rsa.RSAPublicNumbers(e=numbers["e"], n=numbers["n"])
     rprivn = rsa.RSAPrivateNumbers(public_numbers=rpubn, **cnum)

src/cryptojwt/jws/jws.py

@@ -321,7 +321,11 @@ def verify_json(self, jws, keys=None, allow_none=False, at_least_one=False):
         for _sign in _signs:
             protected_headers = _sign.get("protected", "")
             token = b".".join(
-                [protected_headers.encode(), _payload.encode(), _sign["signature"].encode(),]
+                [
+                    protected_headers.encode(),
+                    _payload.encode(),
+                    _sign["signature"].encode(),
+                ]
             )
 
             unprotected_headers = _sign.get("header", {})

src/cryptojwt/jws/pss.py

@@ -38,7 +38,8 @@ def sign(self, msg, key):
         sig = key.sign(
             digest,
             padding.PSS(
-                mgf=padding.MGF1(self.hash_algorithm()), salt_length=padding.PSS.MAX_LENGTH,
+                mgf=padding.MGF1(self.hash_algorithm()),
+                salt_length=padding.PSS.MAX_LENGTH,
             ),
             utils.Prehashed(self.hash_algorithm()),
         )
@@ -59,7 +60,8 @@ def verify(self, msg, signature, key):
                 signature,
                 msg,
                 padding.PSS(
-                    mgf=padding.MGF1(self.hash_algorithm()), salt_length=padding.PSS.MAX_LENGTH,
+                    mgf=padding.MGF1(self.hash_algorithm()),
+                    salt_length=padding.PSS.MAX_LENGTH,
                 ),
                 self.hash_algorithm(),
             )