diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-07-23 18:06:15 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-07-23 18:06:15 -0700 |
| commit | 3319c95bf861f806a1b237c99661b30379389063 (patch) | |
| tree | 2171ef6924514455df5998038a287c1d9136f761 | |
| parent | ad116e26d102651ab6dc2752ae21afb92b72ad6f (diff) | |
| parent | 2231e189a59d80bc4c0cba604d3fc95c61d0a3b9 (diff) | |
| download | cryptography-3319c95bf861f806a1b237c99661b30379389063.tar.gz cryptography-3319c95bf861f806a1b237c99661b30379389063.tar.bz2 cryptography-3319c95bf861f806a1b237c99661b30379389063.zip | |
Merge pull request #1282 from akgood/reorder_libs
Reorder OpenSSL libraries on the linker command-line
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/binding.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py index 4cd1b89b..4cbe3c5b 100644 --- a/cryptography/hazmat/bindings/openssl/binding.py +++ b/cryptography/hazmat/bindings/openssl/binding.py @@ -96,7 +96,11 @@ class Binding(object): # OpenSSL goes by a different library name on different operating # systems. if sys.platform != "win32": - libraries = ["crypto", "ssl"] + # In some circumstances, the order in which these libs are + # specified on the linker command-line is significant; + # libssl must come before libcrypto + # (http://marc.info/?l=openssl-users&m=135361825921871) + libraries = ["ssl", "crypto"] else: # pragma: no cover link_type = os.environ.get("PYCA_WINDOWS_LINK_TYPE", "static") libraries = _get_windows_libraries(link_type) |