vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update find_lib's name for the new openssl-1.1 dll (just for windows) (#796)

Browse source 
the new openssl's dll(1.1) is rename to libcrypto-1_1-x64.dll and libcrypto-1_1.dll
This commit is contained in:
Falseen 2017-03-21 20:15:38 +08:00 • committed by mengskysama
parent 9e25cc6bb4
commit 1222fb19a6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shadowsocks/crypto/util.py
View file

@ -26,6 +26,7 @@ def find_library_nt(name):
# ctypes.util.find_library just returns first result he found # ctypes.util.find_library just returns first result he found
# but we want to try them all # but we want to try them all
# because on Windows, users may have both 32bit and 64bit version installed # because on Windows, users may have both 32bit and 64bit version installed
import glob
results = [] results = []
for directory in os.environ['PATH'].split(os.pathsep): for directory in os.environ['PATH'].split(os.pathsep):
fname = os.path.join(directory, name) fname = os.path.join(directory, name)
@ -33,9 +34,10 @@ def find_library_nt(name):
results.append(fname) results.append(fname)
if fname.lower().endswith(".dll"): if fname.lower().endswith(".dll"):
continue continue
fname += ".dll" fname += "*.dll"
if os.path.isfile(fname): files = glob.glob(fname)
results.append(fname) if files:
results.extend(files)
return results return results