Merge branch 'master' into urandom-engine

* master: (58 commits)
  Moar backtick.
  Add to changelog.
  move some dashes around :)
  experiment to disable duplicate cc test runs on osx and speed up travis
  Remove register_cipher_adapter from the interface and the documentation.
  expand tox backend example
  On OS X at build time compile the CC bindings
  remove an extraneous linefeed
  reformat bindings and remove GCM for the moment
  add cipher bindings for CommonCrypto
  doc updates
  hmac support for commoncrypto
  added versionadded
  changelog to note addition of commoncrypto backend with hash support
  fix docs
  doc updates
  update docs for name attribute
  fix copy mistake in docs
  increase indent and note the value of the attribute in the docs
  move HashMethods to top level
  ...

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)