commit 419e67a1d515ec7883a1e31608c1618e226fbffb
author Paul Kehrer <paul.l.kehrer@gmail.com> Sat Jul 05 11:15:55 2014 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sat Jul 05 11:15:55 2014 -0500
tree 0699120be3aca2e479274af5561b525742e98b4e
parent 9c80e6c8e4b1ae563baffbcbd2918e07f4f709e3

change env variable name, handle empty string

cryptography/hazmat/bindings/openssl/binding.py

diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py
index 7305874..4cd1b89 100644
--- a/cryptography/hazmat/bindings/openssl/binding.py
+++ b/cryptography/hazmat/bindings/openssl/binding.py
@@ -98,7 +98,7 @@
         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 @@
 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'"
         )

docs/installation.rst

diff --git a/docs/installation.rst b/docs/installation.rst
index 81e150d..339d8b7 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -55,15 +55,15 @@
     C:\> pip install cryptography
 
 You can also choose to build statically or dynamically using the
-``PYCA_OPENSSL_INSTALL`` variable. Allowed values are ``static`` (default) and
-``dynamic``.
+``PYCA_WINDOWS_LINK_TYPE`` variable. Allowed values are ``static`` (default)
+and ``dynamic``.
 
 .. code-block:: console
 
     C:\> \path\to\vcvarsall.bat x86_amd64
     C:\> set LIB=C:\OpenSSL\lib\VC\static;C:\OpenSSL\lib;%LIB%
     C:\> set INCLUDE=C:\OpenSSL\include;%INCLUDE%
-    C:\> set PYCA_OPENSSL_INSTALL=dynamic
+    C:\> set PYCA_WINDOWS_LINK_TYPE=dynamic
     C:\> pip install cryptography
 
 Building cryptography on Linux

tests/hazmat/bindings/test_openssl.py

diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py
index 4b51ae8..d22c4fd 100644
--- a/tests/hazmat/bindings/test_openssl.py
+++ b/tests/hazmat/bindings/test_openssl.py
@@ -143,6 +143,8 @@
     def test_windows_static_dynamic_libraries(self):
         assert "ssleay32mt" in _get_windows_libraries("static")
 
+        assert "ssleay32mt" in _get_windows_libraries("")
+
         assert "ssleay32" in _get_windows_libraries("dynamic")
 
         with pytest.raises(ValueError):