Blame SOURCES/rsa-to-cryptography.patch

169488
diff -uNr a/oauth2client/_pure_python_crypt.py b/oauth2client/_pure_python_crypt.py
169488
--- a/oauth2client/_pure_python_crypt.py	2016-10-14 19:53:53.000000000 +0200
169488
+++ b/oauth2client/_pure_python_crypt.py	2018-06-21 15:40:25.216478384 +0200
169488
@@ -23,7 +23,10 @@
169488
 from pyasn1_modules import pem
169488
 from pyasn1_modules.rfc2459 import Certificate
169488
 from pyasn1_modules.rfc5208 import PrivateKeyInfo
169488
-import rsa
169488
+from cryptography.hazmat.primitives import serialization, hashes
169488
+from cryptography.hazmat.primitives.asymmetric import padding
169488
+from cryptography import x509
169488
+from cryptography.hazmat.backends import default_backend
169488
 import six
169488
 
169488
 from oauth2client import _helpers
169488
@@ -70,7 +73,8 @@
169488
     """
169488
 
169488
     def __init__(self, pubkey):
169488
-        self._pubkey = pubkey
169488
+        self._pubkey = serialization.load_pem_public_key(pubkey,
169488
+            backend=default_backend())
169488
 
169488
     def verify(self, message, signature):
169488
         """Verifies a message against a signature.
169488
@@ -87,8 +91,9 @@
169488
         """
169488
         message = _helpers._to_bytes(message, encoding='utf-8')
169488
         try:
169488
-            return rsa.pkcs1.verify(message, signature, self._pubkey)
169488
-        except (ValueError, rsa.pkcs1.VerificationError):
169488
+            return self._pubkey.verify(signature, message, padding.PKCS1v15(),
169488
+                hashes.SHA256())
169488
+        except (ValueError, TypeError, InvalidSignature):
169488
             return False
169488
 
169488
     @classmethod
169488
@@ -112,16 +117,18 @@
169488
         """
169488
         key_pem = _helpers._to_bytes(key_pem)
169488
         if is_x509_cert:
169488
-            der = rsa.pem.load_pem(key_pem, 'CERTIFICATE')
169488
+            der = x509.load_pem_x509_certificate(pem_data, default_backend())
169488
             asn1_cert, remaining = decoder.decode(der, asn1Spec=Certificate())
169488
             if remaining != b'':
169488
                 raise ValueError('Unused bytes', remaining)
169488
 
169488
             cert_info = asn1_cert['tbsCertificate']['subjectPublicKeyInfo']
169488
             key_bytes = _bit_list_to_bytes(cert_info['subjectPublicKey'])
169488
-            pubkey = rsa.PublicKey.load_pkcs1(key_bytes, 'DER')
169488
+            pubkey = serialization.load_der_public_key(decoded_key,
169488
+                backend=default_backend())
169488
         else:
169488
-            pubkey = rsa.PublicKey.load_pkcs1(key_pem, 'PEM')
169488
+            pubkey = serialization.load_pem_public_key(decoded_key,
169488
+                backend=default_backend())
169488
         return cls(pubkey)
169488
 
169488
 
169488
@@ -134,6 +141,8 @@
169488
 
169488
     def __init__(self, pkey):
169488
         self._key = pkey
169488
+        self._pubkey = serialization.load_pem_private_key(pkey,
169488
+            backend=default_backend())
169488
 
169488
     def sign(self, message):
169488
         """Signs a message.
169488
@@ -145,7 +154,7 @@
169488
             string, The signature of the message for the given key.
169488
         """
169488
         message = _helpers._to_bytes(message, encoding='utf-8')
169488
-        return rsa.pkcs1.sign(message, self._key, 'SHA-256')
169488
+        return self._key.sign(message, padding.PKCS1v15(), hashes.SHA256())
169488
 
169488
     @classmethod
169488
     def from_string(cls, key, password='notasecret'):
169488
@@ -168,16 +177,19 @@
169488
             six.StringIO(key), _PKCS1_MARKER, _PKCS8_MARKER)
169488
 
169488
         if marker_id == 0:
169488
-            pkey = rsa.key.PrivateKey.load_pkcs1(key_bytes,
169488
-                                                 format='DER')
169488
+            pkey = serialization.load_der_private_key(
169488
+                key_bytes, password=None,
169488
+                backend=default_backend())
169488
+
169488
         elif marker_id == 1:
169488
             key_info, remaining = decoder.decode(
169488
                 key_bytes, asn1Spec=_PKCS8_SPEC)
169488
             if remaining != b'':
169488
                 raise ValueError('Unused bytes', remaining)
169488
             pkey_info = key_info.getComponentByName('privateKey')
169488
-            pkey = rsa.key.PrivateKey.load_pkcs1(pkey_info.asOctets(),
169488
-                                                 format='DER')
169488
+            pkey = serialization.load_der_private_key(
169488
+                pkey_info.asOctets(), password=None,
169488
+                backend=default_backend())
169488
         else:
169488
             raise ValueError('No key could be detected.')
169488