diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-23 19:07:07 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-23 20:12:23 -0600 |
| commit | f84ca678b1a09a0e7ddcdb14a2c938a814f7dca5 (patch) | |
| tree | 377a65206ea25529d370a267a512c197c88b1026 | |
| parent | 46ffbfb98d8b531b0100195d53dbfc53bcd517f1 (diff) | |
| download | cryptography-f84ca678b1a09a0e7ddcdb14a2c938a814f7dca5.tar.gz cryptography-f84ca678b1a09a0e7ddcdb14a2c938a814f7dca5.tar.bz2 cryptography-f84ca678b1a09a0e7ddcdb14a2c938a814f7dca5.zip | |
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.
| -rw-r--r-- | .coveragerc | 1 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/binding.py | 10 |
2 files changed, 10 insertions, 1 deletions
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): |