diff options
| author | David Reid <dreid@dreid.org> | 2014-01-07 16:22:15 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-01-07 16:22:15 -0800 |
| commit | 960159d5abfbbc480041d405c596be8d4529775c (patch) | |
| tree | f0a38018cb976b035c9e6302eecca314ec2186bf /cryptography | |
| parent | 7ec30af9a58647d1e38bb78b5381e64af67128a6 (diff) | |
| parent | 9a95dad8df43fdc9149fac3e0a6302a3f5b61b6e (diff) | |
| download | cryptography-960159d5abfbbc480041d405c596be8d4529775c.tar.gz cryptography-960159d5abfbbc480041d405c596be8d4529775c.tar.bz2 cryptography-960159d5abfbbc480041d405c596be8d4529775c.zip | |
Merge pull request #414 from alex/avail-cleanup
Fixed #408 -- cleanup how is_available works
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/binding.py | 8 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/utils.py | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py index 2a1e1184..8a4e1dd3 100644 --- a/cryptography/hazmat/bindings/openssl/binding.py +++ b/cryptography/hazmat/bindings/openssl/binding.py @@ -13,9 +13,8 @@ from __future__ import absolute_import, division, print_function -from cryptography.hazmat.bindings.utils import ( - build_ffi, binding_available -) +from cryptography.hazmat.bindings.utils import build_ffi + _OSX_PRE_INCLUDE = """ #ifdef __APPLE__ @@ -84,4 +83,5 @@ class Binding(object): @classmethod def is_available(cls): - return binding_available(cls._ensure_ffi_initialized) + # OpenSSL is the only binding so for now it must always be available + return True diff --git a/cryptography/hazmat/bindings/utils.py b/cryptography/hazmat/bindings/utils.py index 40fd07f8..69290eb3 100644 --- a/cryptography/hazmat/bindings/utils.py +++ b/cryptography/hazmat/bindings/utils.py @@ -87,11 +87,3 @@ def build_ffi(module_prefix, modules, pre_include, post_include, libraries): delattr(lib, name) return ffi, lib - - -def binding_available(initializer): - try: - initializer() - return True - except cffi.VerificationError: - return False |