From 0afd0d3394a562a2d5b4d3c75c89b46578e2ec41 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 4 Mar 2014 10:31:50 -0800 Subject: On OS X, prefer Common Crypto to OpenSSL --- cryptography/hazmat/backends/__init__.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cryptography/hazmat/backends/__init__.py b/cryptography/hazmat/backends/__init__.py index 41d260a8..4cb15c62 100644 --- a/cryptography/hazmat/backends/__init__.py +++ b/cryptography/hazmat/backends/__init__.py @@ -11,18 +11,25 @@ # See the License for the specific language governing permissions and # limitations under the License. -from cryptography.hazmat.backends import openssl from cryptography.hazmat.backends.multibackend import MultiBackend from cryptography.hazmat.bindings.commoncrypto.binding import ( Binding as CommonCryptoBinding ) +from cryptography.hazmat.bindings.openssl.binding import ( + Binding as OpenSSLBinding +) -_ALL_BACKENDS = [openssl.backend] +_ALL_BACKENDS = [] if CommonCryptoBinding.is_available(): from cryptography.hazmat.backends import commoncrypto _ALL_BACKENDS.append(commoncrypto.backend) +if OpenSSLBinding.is_available(): + from cryptography.hazmat.backends import openssl + _ALL_BACKENDS.append(openssl.backend) + + _default_backend = MultiBackend(_ALL_BACKENDS) -- cgit v1.2.3 From 21e4303a9aac62e432308dc40fae5fb14a919805 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 4 Mar 2014 10:37:12 -0800 Subject: flake8 --- cryptography/hazmat/backends/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cryptography/hazmat/backends/__init__.py b/cryptography/hazmat/backends/__init__.py index 4cb15c62..10067ede 100644 --- a/cryptography/hazmat/backends/__init__.py +++ b/cryptography/hazmat/backends/__init__.py @@ -30,7 +30,6 @@ if OpenSSLBinding.is_available(): _ALL_BACKENDS.append(openssl.backend) - _default_backend = MultiBackend(_ALL_BACKENDS) -- cgit v1.2.3 From 5c269a66564ca00562a73673a39aa5f644236e77 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 4 Mar 2014 11:09:09 -0800 Subject: This branch isn't coverable yet --- cryptography/hazmat/backends/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cryptography/hazmat/backends/__init__.py b/cryptography/hazmat/backends/__init__.py index 10067ede..406b37e5 100644 --- a/cryptography/hazmat/backends/__init__.py +++ b/cryptography/hazmat/backends/__init__.py @@ -11,13 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +from cryptography.hazmat.backends import openssl from cryptography.hazmat.backends.multibackend import MultiBackend from cryptography.hazmat.bindings.commoncrypto.binding import ( Binding as CommonCryptoBinding ) -from cryptography.hazmat.bindings.openssl.binding import ( - Binding as OpenSSLBinding -) _ALL_BACKENDS = [] @@ -25,9 +23,7 @@ if CommonCryptoBinding.is_available(): from cryptography.hazmat.backends import commoncrypto _ALL_BACKENDS.append(commoncrypto.backend) -if OpenSSLBinding.is_available(): - from cryptography.hazmat.backends import openssl - _ALL_BACKENDS.append(openssl.backend) +_ALL_BACKENDS.append(openssl.backend) _default_backend = MultiBackend(_ALL_BACKENDS) -- cgit v1.2.3