diff options
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/binding.py | 8 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/utils.py | 8 | ||||
| -rw-r--r-- | tests/hazmat/bindings/test_bindings.py | 32 |
3 files changed, 4 insertions, 44 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 diff --git a/tests/hazmat/bindings/test_bindings.py b/tests/hazmat/bindings/test_bindings.py deleted file mode 100644 index 7af1d581..00000000 --- a/tests/hazmat/bindings/test_bindings.py +++ /dev/null @@ -1,32 +0,0 @@ -# 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. - -from __future__ import absolute_import, division, print_function - -import cffi - -from cryptography.hazmat.bindings.utils import binding_available -from cryptography.hazmat.bindings.openssl.binding import Binding - - -def dummy_initializer(): - ffi = cffi.FFI() - ffi.verify(source="#include <fake_header.h>") - - -def test_binding_available(): - assert binding_available(Binding._ensure_ffi_initialized) is True - - -def test_binding_unavailable(): - assert binding_available(dummy_initializer) is False |