Restore HAS_OPENSSL.
Reviewed in https://codereview.appspot.com/7323052/.
diff --git a/oauth2client/client.py b/oauth2client/client.py
index 3370688..918539a 100644
--- a/oauth2client/client.py
+++ b/oauth2client/client.py
@@ -37,10 +37,13 @@
from oauth2client import util
from oauth2client.anyjson import simplejson
+HAS_OPENSSL = False
HAS_CRYPTO = False
try:
from oauth2client import crypt
HAS_CRYPTO = True
+ if crypt.OpenSSLVerifier is not None:
+ HAS_OPENSSL = True
except ImportError:
pass
diff --git a/tests/test_oauth2client_jwt.py b/tests/test_oauth2client_jwt.py
index 960a55a..0016153 100644
--- a/tests/test_oauth2client_jwt.py
+++ b/tests/test_oauth2client_jwt.py
@@ -42,6 +42,8 @@
from oauth2client.client import SignedJwtAssertionCredentials
from oauth2client.client import VerifyJwtTokenError
from oauth2client.client import verify_id_token
+from oauth2client.client import HAS_OPENSSL
+from oauth2client.client import HAS_CRYPTO
from oauth2client.file import Storage
@@ -310,6 +312,10 @@
except NotImplementedError:
pass
+class TestHasOpenSSLFlag(unittest.TestCase):
+ def test_true(self):
+ self.assertEqual(True, HAS_OPENSSL)
+ self.assertEqual(True, HAS_CRYPTO)
if __name__ == '__main__':
unittest.main()