diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-08-21 15:45:54 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-08-21 15:45:54 -0700 |
| commit | 567d82e867845049aea81d06fe6abc2849aed279 (patch) | |
| tree | eae42f6275c1b5893dd1ae6da2efdd6d7b6f5709 | |
| parent | 22bc06a6c65ba639ee0dfce37c493ba197c7f344 (diff) | |
| parent | f4fbf390ed435fda4fe2e6d0ab4d049a045484f1 (diff) | |
| download | cryptography-567d82e867845049aea81d06fe6abc2849aed279.tar.gz cryptography-567d82e867845049aea81d06fe6abc2849aed279.tar.bz2 cryptography-567d82e867845049aea81d06fe6abc2849aed279.zip | |
Merge pull request #1314 from reaperhulk/yosemite-fix
link corefoundation in the CC binding.
| -rw-r--r-- | CHANGELOG.rst | 1 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/commoncrypto/binding.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 396b5c2d..dfc6d8b0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,7 @@ Changelog the :class:`~cryptography.hazmat.primitives.asymmetric.padding.MGF1` constructor. The ``salt_length`` should be passed to :class:`~cryptography.hazmat.primitives.asymmetric.padding.PSS` instead. +* Fix compilation on OS X Yosemite. 0.5.4 - 2014-08-20 ~~~~~~~~~~~~~~~~~~ diff --git a/cryptography/hazmat/bindings/commoncrypto/binding.py b/cryptography/hazmat/bindings/commoncrypto/binding.py index ee09bebd..e23a2fd9 100644 --- a/cryptography/hazmat/bindings/commoncrypto/binding.py +++ b/cryptography/hazmat/bindings/commoncrypto/binding.py @@ -48,5 +48,7 @@ class Binding(object): cls.ffi, cls.lib = build_ffi( module_prefix=cls._module_prefix, modules=cls._modules, - extra_link_args=["-framework", "Security"] + extra_link_args=[ + "-framework", "Security", "-framework", "CoreFoundation" + ] ) |