Skip to content

Commit

Permalink
use the static libcrypto_static for windows and openssl 1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
holgern committed Feb 12, 2019
1 parent cfa4e90 commit bbb4108
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----

Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down Expand Up @@ -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='[email protected]',
Expand Down

0 comments on commit bbb4108

Please sign in to comment.