From f84ca678b1a09a0e7ddcdb14a2c938a814f7dca5 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 23 Jan 2014 19:07:07 -0600 Subject: add library switch for windows support Temporarily using pragma: no cover on it until we have windows coverage on travis. Windows builds will be done via jenkins for now. --- .coveragerc | 1 + cryptography/hazmat/bindings/openssl/binding.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 20e3224e..03fc621e 100644 --- a/.coveragerc +++ b/.coveragerc @@ -3,5 +3,6 @@ branch = True [report] exclude_lines = + pragma: no cover @abc.abstractmethod @abc.abstractproperty diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py index 4dedd816..f30b551a 100644 --- a/cryptography/hazmat/bindings/openssl/binding.py +++ b/cryptography/hazmat/bindings/openssl/binding.py @@ -13,6 +13,8 @@ from __future__ import absolute_import, division, print_function +import sys + from cryptography.hazmat.bindings.utils import build_ffi @@ -79,9 +81,15 @@ class Binding(object): if cls.ffi is not None and cls.lib is not None: return + # platform check to set the right library names + if sys.platform != "win32": + libraries = ["crypto", "ssl"] + else: # pragma: no cover + libraries = ["libeay32", "ssleay32", "advapi32"] + cls.ffi, cls.lib = build_ffi(cls._module_prefix, cls._modules, _OSX_PRE_INCLUDE, _OSX_POST_INCLUDE, - ["crypto", "ssl"]) + libraries) @classmethod def is_available(cls): -- cgit v1.2.3 From 8942efae8a39f63779a4721c22a4dd961ecc537c Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 23 Jan 2014 20:54:34 -0600 Subject: remove advapi32 until we need it (for cryptgenrandom) --- cryptography/hazmat/bindings/openssl/binding.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py index f30b551a..1c17a5b2 100644 --- a/cryptography/hazmat/bindings/openssl/binding.py +++ b/cryptography/hazmat/bindings/openssl/binding.py @@ -85,7 +85,7 @@ class Binding(object): if sys.platform != "win32": libraries = ["crypto", "ssl"] else: # pragma: no cover - libraries = ["libeay32", "ssleay32", "advapi32"] + libraries = ["libeay32", "ssleay32"] cls.ffi, cls.lib = build_ffi(cls._module_prefix, cls._modules, _OSX_PRE_INCLUDE, _OSX_POST_INCLUDE, -- cgit v1.2.3 From b495790a40a530c63b231fee9c5f21cae8a85648 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 23 Jan 2014 21:12:19 -0600 Subject: add windows support to changelog --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 4b5a5be8..c8843821 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -10,6 +10,7 @@ Changelog * Added initial :doc:`/hazmat/bindings/commoncrypto`. * Removed ``register_cipher_adapter`` method from :class:`~cryptography.hazmat.backends.interfaces.CipherBackend`. +* Added support for the OpenSSL backend under Windows. 0.1 - 2014-01-08 ~~~~~~~~~~~~~~~~ -- cgit v1.2.3