Update oauth2client to v2.0.1 and googleapiclient to v1.5.0.

client/third_party/oauth2client/crypt.py

 # -*- coding: utf-8 -*-
 #
 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Crypto-related routines for oauth2client."""
 
 import json
 import logging
 import time
 
 from oauth2client._helpers import _from_bytes
 from oauth2client._helpers import _json_encode
 from oauth2client._helpers import _to_bytes
 from oauth2client._helpers import _urlsafe_b64decode
 from oauth2client._helpers import _urlsafe_b64encode
+from oauth2client._pure_python_crypt import RsaSigner
+from oauth2client._pure_python_crypt import RsaVerifier
 
 
 CLOCK_SKEW_SECS = 300  # 5 minutes in seconds
 AUTH_TOKEN_LIFETIME_SECS = 300  # 5 minutes in seconds
 MAX_TOKEN_LIFETIME_SECS = 86400  # 1 day in seconds
 
 logger = logging.getLogger(__name__)
 
 
 class AppIdentityError(Exception):
@@ skipping 21 matching lines @@
     PyCryptoSigner = None
 
 
 if OpenSSLSigner:
     Signer = OpenSSLSigner
     Verifier = OpenSSLVerifier
 elif PyCryptoSigner:  # pragma: NO COVER
     Signer = PyCryptoSigner
     Verifier = PyCryptoVerifier
 else:  # pragma: NO COVER
-    raise ImportError('No encryption library found. Please install either '
-                      'PyOpenSSL, or PyCrypto 2.6 or later')
+    Signer = RsaSigner
+    Verifier = RsaVerifier
 
 
-def make_signed_jwt(signer, payload):
+def make_signed_jwt(signer, payload, key_id=None):
     """Make a signed JWT.
 
     See http://self-issued.info/docs/draft-jones-json-web-token.html.
 
     Args:
         signer: crypt.Signer, Cryptographic signer.
         payload: dict, Dictionary of data to convert to JSON and then sign.
+        key_id: string, (Optional) Key ID header.
 
     Returns:
         string, The JWT for the payload.
     """
     header = {'typ': 'JWT', 'alg': 'RS256'}
+    if key_id is not None:
+        header['kid'] = key_id
 
     segments = [
-      _urlsafe_b64encode(_json_encode(header)),
-      _urlsafe_b64encode(_json_encode(payload)),
+        _urlsafe_b64encode(_json_encode(header)),
+        _urlsafe_b64encode(_json_encode(payload)),
     ]
     signing_input = b'.'.join(segments)
 
     signature = signer.sign(signing_input)
     segments.append(_urlsafe_b64encode(signature))
 
     logger.debug(str(segments))
 
     return b'.'.join(segments)
 
@@ skipping 135 matching lines @@
     # Verify that the signature matches the message.
     _verify_signature(message_to_sign, signature, certs.values())
 
     # Verify the issued at and created times in the payload.
     _verify_time_range(payload_dict)
 
     # Check audience.
     _check_audience(payload_dict, audience)
 
     return payload_dict