commit a92a1a708f3973d0640a6f7c9e43adf1e6925f82
author Paul Kehrer <paul.l.kehrer@gmail.com> Wed Jul 19 15:53:23 2017 +0200
committer Alex Gaynor <alex.gaynor@gmail.com> Wed Jul 19 09:53:23 2017 -0400
tree 2fc45d1924f886f05a70a17751498a48aaa478b6
parent 7f5610c7f387e554149206137b182c1ff656898f

fix #664 (#665)

* fix #664

bytes and strings are different things.

* update changelog

* let's just make the sentinel values byte strings

* flake8

src/OpenSSL/SSL.py

diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index 9ac9651..8d94bd8 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -145,8 +145,10 @@
     "/etc/ssl/certs",  # SLES10/SLES11
 ]
 
-_CRYPTOGRAPHY_MANYLINUX1_CA_DIR = "/opt/pyca/cryptography/openssl/certs"
-_CRYPTOGRAPHY_MANYLINUX1_CA_FILE = "/opt/pyca/cryptography/openssl/cert.pem"
+# These values are compared to output from cffi's ffi.string so they must be
+# byte strings.
+_CRYPTOGRAPHY_MANYLINUX1_CA_DIR = b"/opt/pyca/cryptography/openssl/certs"
+_CRYPTOGRAPHY_MANYLINUX1_CA_FILE = b"/opt/pyca/cryptography/openssl/cert.pem"
 
 
 class Error(Exception):