diff options
| author | Ian Cordasco <graffatcolmingov@gmail.com> | 2015-08-03 08:26:42 -0500 |
|---|---|---|
| committer | Ian Cordasco <graffatcolmingov@gmail.com> | 2015-08-03 08:26:42 -0500 |
| commit | a0f00f47ea3aa53a31213843d60a4141e468f021 (patch) | |
| tree | a663f2bb14b0ed45054c03971cb47005155cecb2 /src/_cffi_src/build_openssl.py | |
| parent | 36a1238703a1aa7aff44654e2e551f2a022c9c1a (diff) | |
| parent | 93b5e3efab0337c51c84c27208d9034b607f09e2 (diff) | |
| download | cryptography-a0f00f47ea3aa53a31213843d60a4141e468f021.tar.gz cryptography-a0f00f47ea3aa53a31213843d60a4141e468f021.tar.bz2 cryptography-a0f00f47ea3aa53a31213843d60a4141e468f021.zip | |
Merge remote-tracking branch 'upstream/master' into cert-builder
Diffstat (limited to 'src/_cffi_src/build_openssl.py')
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index dac3e4d8..6a5bf2da 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -4,7 +4,6 @@ from __future__ import absolute_import, division, print_function -import os import sys from _cffi_src.utils import build_ffi_for_binding, extra_link_args @@ -19,20 +18,8 @@ def _get_openssl_libraries(platform): # (http://marc.info/?l=openssl-users&m=135361825921871) return ["ssl", "crypto"] else: - link_type = os.environ.get("PYCA_WINDOWS_LINK_TYPE", "static") - return _get_openssl_windows_libraries(link_type) - - -def _get_openssl_windows_libraries(link_type): - if link_type == "dynamic": - return ["libeay32", "ssleay32", "advapi32"] - elif link_type == "static" or link_type == "": - return ["libeay32mt", "ssleay32mt", "advapi32", + return ["libeay32", "ssleay32", "advapi32", "crypt32", "gdi32", "user32", "ws2_32"] - else: - raise ValueError( - "PYCA_WINDOWS_LINK_TYPE must be 'static' or 'dynamic'" - ) _OSX_PRE_INCLUDE = """ |