diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-03 17:31:37 -0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-03 17:31:37 -0800 |
| commit | 010190ff62d7a4d941637bb0780663f4b2e639a6 (patch) | |
| tree | 3e46c24be05e99e542141ba650837f91f38632ed | |
| parent | ba5fcd97baf193259a156caa5b5cbc107ee46794 (diff) | |
| parent | f3cdf71df22f78f7ce486fd5202a50356748cd94 (diff) | |
| download | cryptography-010190ff62d7a4d941637bb0780663f4b2e639a6.tar.gz cryptography-010190ff62d7a4d941637bb0780663f4b2e639a6.tar.bz2 cryptography-010190ff62d7a4d941637bb0780663f4b2e639a6.zip | |
Merge pull request #556 from alex/multi-by-default
Make the default backend be a multi-backend
| -rw-r--r-- | cryptography/hazmat/backends/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/__init__.py b/cryptography/hazmat/backends/__init__.py index d1b95f2a..41d260a8 100644 --- a/cryptography/hazmat/backends/__init__.py +++ b/cryptography/hazmat/backends/__init__.py @@ -12,6 +12,7 @@ # 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 ) @@ -23,5 +24,8 @@ if CommonCryptoBinding.is_available(): _ALL_BACKENDS.append(commoncrypto.backend) +_default_backend = MultiBackend(_ALL_BACKENDS) + + def default_backend(): - return openssl.backend + return _default_backend |