Merge branch 'master' into commoncrypto-cipher-backend

* master:
  expand tox backend example
  On OS X at build time compile the CC bindings
  fix docs
  update docs for name attribute
  revert fixture decorator for now, switch to append. no more globals
  docs for explicit backend selection and document name attribute of backend
  modify backend selection to allow multiple backends via comma delimiter
  better name for the variable
  don't mutate _ALL_BACKENDS
  pass posargs via tox so --backend can be used for tox envs
  support --backend as a pytest flag to limit to one backend for testing

1 files changed, 11 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index e8bcc11f..57a95752 100644
--- a/setup.py
+++ b/setup.py
@@ -43,14 +43,23 @@ class cffi_build(build):
     """
 
     def finalize_options(self):
-        from cryptography.hazmat.bindings.openssl.binding import Binding
+        from cryptography.hazmat.bindings.commoncrypto.binding import (
+            Binding as CommonCryptoBinding
+        )
+        from cryptography.hazmat.bindings.openssl.binding import (
+            Binding as OpenSSLBinding
+        )
         from cryptography.hazmat.primitives import constant_time, padding
 
         self.distribution.ext_modules = [
-            Binding().ffi.verifier.get_extension(),
+            OpenSSLBinding().ffi.verifier.get_extension(),
             constant_time._ffi.verifier.get_extension(),
             padding._ffi.verifier.get_extension()
         ]
+        if CommonCryptoBinding.is_available():
+            self.distribution.ext_modules.append(
+                CommonCryptoBinding().ffi.verifier.get_extension()
+            )
 
         build.finalize_options(self)