diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-07-05 11:15:55 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-07-05 11:15:55 -0500 |
| commit | 419e67a1d515ec7883a1e31608c1618e226fbffb (patch) | |
| tree | 0699120be3aca2e479274af5561b525742e98b4e /cryptography | |
| parent | 9c80e6c8e4b1ae563baffbcbd2918e07f4f709e3 (diff) | |
| download | cryptography-419e67a1d515ec7883a1e31608c1618e226fbffb.tar.gz cryptography-419e67a1d515ec7883a1e31608c1618e226fbffb.tar.bz2 cryptography-419e67a1d515ec7883a1e31608c1618e226fbffb.zip | |
change env variable name, handle empty string
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/binding.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py index 7305874b..4cd1b89b 100644 --- a/cryptography/hazmat/bindings/openssl/binding.py +++ b/cryptography/hazmat/bindings/openssl/binding.py @@ -98,7 +98,7 @@ class Binding(object): if sys.platform != "win32": libraries = ["crypto", "ssl"] else: # pragma: no cover - link_type = os.environ.get("PYCA_OPENSSL_INSTALL", "static") + link_type = os.environ.get("PYCA_WINDOWS_LINK_TYPE", "static") libraries = _get_windows_libraries(link_type) cls.ffi, cls.lib = build_ffi( @@ -161,10 +161,10 @@ class Binding(object): def _get_windows_libraries(link_type): if link_type == "dynamic": return ["libeay32", "ssleay32", "advapi32"] - elif link_type == "static": + elif link_type == "static" or link_type == "": return ["libeay32mt", "ssleay32mt", "advapi32", "crypt32", "gdi32", "user32", "ws2_32"] else: raise ValueError( - "PYCA_OPENSSL_INSTALL must be 'static' or 'dynamic'" + "PYCA_WINDOWS_LINK_TYPE must be 'static' or 'dynamic'" ) |