diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-04 15:31:20 -0430 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-04 15:31:20 -0430 |
| commit | a358d6bb2809a6abe485d65973fa30f8e534e5f5 (patch) | |
| tree | 5bfae0f8351e00c2276bb1dc9638211938a4a9e8 | |
| parent | 243fd3d6794e397e3e41091337dd2724d477fd0b (diff) | |
| parent | 5c269a66564ca00562a73673a39aa5f644236e77 (diff) | |
| download | cryptography-a358d6bb2809a6abe485d65973fa30f8e534e5f5.tar.gz cryptography-a358d6bb2809a6abe485d65973fa30f8e534e5f5.tar.bz2 cryptography-a358d6bb2809a6abe485d65973fa30f8e534e5f5.zip | |
Merge pull request #728 from alex/prefer-cc
On OS X, prefer Common Crypto to OpenSSL
| -rw-r--r-- | cryptography/hazmat/backends/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/__init__.py b/cryptography/hazmat/backends/__init__.py index 41d260a8..406b37e5 100644 --- a/cryptography/hazmat/backends/__init__.py +++ b/cryptography/hazmat/backends/__init__.py @@ -17,12 +17,14 @@ from cryptography.hazmat.bindings.commoncrypto.binding import ( Binding as CommonCryptoBinding ) -_ALL_BACKENDS = [openssl.backend] +_ALL_BACKENDS = [] if CommonCryptoBinding.is_available(): from cryptography.hazmat.backends import commoncrypto _ALL_BACKENDS.append(commoncrypto.backend) +_ALL_BACKENDS.append(openssl.backend) + _default_backend = MultiBackend(_ALL_BACKENDS) |