From bbb41080e40e992fd6416b10bebf722d04c2b35b Mon Sep 17 00:00:00 2001 From: holgern Date: Tue, 12 Feb 2019 07:48:11 +0100 Subject: [PATCH] use the static libcrypto_static for windows and openssl 1.1.1 --- README.rst | 5 +++++ setup.py | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index d8b3f85..8eca1bf 100644 --- a/README.rst +++ b/README.rst @@ -90,6 +90,11 @@ PyPy as well. Changelog ========= +0.8.9 +----- + +* use the static libcrypto_static for windows and openssl 1.1.1 + 0.8.8 ----- diff --git a/setup.py b/setup.py index 1c543af..2285e04 100644 --- a/setup.py +++ b/setup.py @@ -33,20 +33,20 @@ extra_sources = ['scrypt-windows-stubs/gettimeofday.c'] if struct.calcsize('P') == 8: if os.path.isdir('c:\OpenSSL-Win64'): - openssl_dir = 'c:\OpenSSL-Win64' - else: openssl_dir = 'c:\OpenSSL-v111-Win64' + else: + openssl_dir = 'c:\OpenSSL-Win64' library_dirs = [openssl_dir + '\lib'] includes = [openssl_dir + '\include', 'scrypt-windows-stubs/include'] else: if os.path.isdir('c:\OpenSSL-Win32'): - openssl_dir = 'c:\OpenSSL-Win32' - else: openssl_dir = 'c:\OpenSSL-v111-Win32' + else: + openssl_dir = 'c:\OpenSSL-Win32' library_dirs = [openssl_dir + '\lib'] includes = [openssl_dir + '\include', 'scrypt-windows-stubs/include'] if os.path.isfile(library_dirs[0] + '\libcrypto.lib'): - libraries = ['libcrypto', 'advapi32'] + libraries = ['libcrypto_static', 'advapi32'] else: libraries = ['libeay32', 'advapi32'] @@ -98,7 +98,7 @@ libraries=libraries) setup(name='scrypt', - version='0.8.8', + version='0.8.9', description='Bindings for the scrypt key derivation function library', author='Magnus Hallin', author_email='mhallin@gmail.com',