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