From 912f96bed8d6435e2cc03bee21780cd8b24bca0e Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 27 Jan 2018 19:49:42 +0100 Subject: [PATCH] do .h file content checks in binary mode, fixes #3544 we can't know the encoding header file authors will use, so using binary for our simple checks is the safest way. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 3a903aab3..2479211be 100644 --- a/setup.py +++ b/setup.py @@ -101,8 +101,8 @@ def detect_openssl(prefixes): for prefix in prefixes: filename = os.path.join(prefix, 'include', 'openssl', 'evp.h') if os.path.exists(filename): - with open(filename, 'r') as fd: - if 'PKCS5_PBKDF2_HMAC(' in fd.read(): + with open(filename, 'rb') as fd: + if b'PKCS5_PBKDF2_HMAC(' in fd.read(): return prefix @@ -110,8 +110,8 @@ def detect_lz4(prefixes): for prefix in prefixes: filename = os.path.join(prefix, 'include', 'lz4.h') if os.path.exists(filename): - with open(filename, 'r') as fd: - if 'LZ4_decompress_safe' in fd.read(): + with open(filename, 'rb') as fd: + if b'LZ4_decompress_safe' in fd.read(): return prefix