From 1cfe8748937b3d3a1d6fe9da354a835351c19e27 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Thu, 8 Aug 2019 23:37:43 +0200 Subject: [PATCH] Use find_library first to locate libeay32 --- src/lib/pyelliptic/openssl.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/pyelliptic/openssl.py b/src/lib/pyelliptic/openssl.py index 7bc88fa4..bc4fe6a6 100644 --- a/src/lib/pyelliptic/openssl.py +++ b/src/lib/pyelliptic/openssl.py @@ -500,6 +500,12 @@ def loadOpenSSL(): from ctypes.util import find_library libdir = [] + + if 'linux' in sys.platform or 'darwin' in sys.platform or 'bsd' in sys.platform: + libdir.append(find_library('ssl')) + elif 'win32' in sys.platform or 'win64' in sys.platform: + libdir.append(find_library('libeay32')) + if getattr(sys,'frozen', None): if 'darwin' in sys.platform: libdir.extend([ @@ -536,10 +542,6 @@ def loadOpenSSL(): libdir.append('libssl.so') libdir.append('libcrypto.so.1.0.0') libdir.append('libssl.so.1.0.0') - if 'linux' in sys.platform or 'darwin' in sys.platform or 'bsd' in sys.platform: - libdir.append(find_library('ssl')) - elif 'win32' in sys.platform or 'win64' in sys.platform: - libdir.append(find_library('libeay32')) for library in libdir: try: OpenSSL = _OpenSSL(library)