Update PyJWT temporarily until package release

Author: jpadilla

requirements.txt

@@ -1,3 +1,2 @@
 Django>=1.3
-djangorestframework>=2.3.10
-pycrypto>=2.6.1
+djangorestframework>=2.3.10

rest_framework_jwt/jwt.py

@@ -3,7 +3,7 @@
 Minimum implementation based on this spec:
 http://self-issued.info/docs/draft-jones-json-web-token-01.html
 
-Taken from: https://github.com/progrium/pyjwt @ 6b1e5e0
+Taken from: https://github.com/progrium/pyjwt @ 3bade27
 """
 from __future__ import unicode_literals
 import base64
@@ -16,11 +16,6 @@
 from calendar import timegm
 from collections import Mapping
 
-from Crypto.Signature import PKCS1_v1_5
-from Crypto.Hash import SHA256
-from Crypto.Hash import SHA384
-from Crypto.Hash import SHA512
-
 try:
     import json
 except ImportError:
@@ -44,20 +39,34 @@ class ExpiredSignature(Exception):
 signing_methods = {
     'HS256': lambda msg, key: hmac.new(key, msg, hashlib.sha256).digest(),
     'HS384': lambda msg, key: hmac.new(key, msg, hashlib.sha384).digest(),
-    'HS512': lambda msg, key: hmac.new(key, msg, hashlib.sha512).digest(),
-    'RS256': lambda msg, key: PKCS1_v1_5.new(key).sign(SHA256.new(msg)),
-    'RS384': lambda msg, key: PKCS1_v1_5.new(key).sign(SHA384.new(msg)),
-    'RS512': lambda msg, key: PKCS1_v1_5.new(key).sign(SHA512.new(msg)),
-    }
+    'HS512': lambda msg, key: hmac.new(key, msg, hashlib.sha512).digest()
+}
 
 verify_methods = {
     'HS256': lambda msg, key: hmac.new(key, msg, hashlib.sha256).digest(),
     'HS384': lambda msg, key: hmac.new(key, msg, hashlib.sha384).digest(),
-    'HS512': lambda msg, key: hmac.new(key, msg, hashlib.sha512).digest(),
-    'RS256': lambda msg, key, sig: PKCS1_v1_5.new(key).verify(SHA256.new(msg), sig),
-    'RS384': lambda msg, key, sig: PKCS1_v1_5.new(key).verify(SHA384.new(msg), sig),
-    'RS512': lambda msg, key, sig: PKCS1_v1_5.new(key).verify(SHA512.new(msg), sig),
-    }
+    'HS512': lambda msg, key: hmac.new(key, msg, hashlib.sha512).digest()
+}
+
+try:
+    from Crypto.Signature import PKCS1_v1_5
+    from Crypto.Hash import SHA256
+    from Crypto.Hash import SHA384
+    from Crypto.Hash import SHA512
+
+    signing_methods.update({
+        'RS256': lambda msg, key: PKCS1_v1_5.new(key).sign(SHA256.new(msg)),
+        'RS384': lambda msg, key: PKCS1_v1_5.new(key).sign(SHA384.new(msg)),
+        'RS512': lambda msg, key: PKCS1_v1_5.new(key).sign(SHA512.new(msg))
+    })
+
+    verify_methods.update({
+        'RS256': lambda msg, key, sig: PKCS1_v1_5.new(key).verify(SHA256.new(msg), sig),
+        'RS384': lambda msg, key, sig: PKCS1_v1_5.new(key).verify(SHA384.new(msg), sig),
+        'RS512': lambda msg, key, sig: PKCS1_v1_5.new(key).verify(SHA512.new(msg), sig)
+    })
+except ImportError:
+    pass
 
 
 def constant_time_compare(val1, val2):
@@ -179,4 +188,4 @@ def decode(jwt, key='', verify=True, verify_expiration=True, leeway=0):
             utc_timestamp = timegm(datetime.utcnow().utctimetuple())
             if payload['exp'] < (utc_timestamp - leeway):
                 raise ExpiredSignature("Signature has expired")
-    return payload
+    return payload