summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/OpenSSL/SSL.py8
-rw-r--r--tests/test_ssl.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index d4eb243..12374b7 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -259,8 +259,8 @@ _CERTIFICATE_PATH_LOCATIONS = [
# 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"
+_CRYPTOGRAPHY_MANYLINUX_CA_DIR = b"/opt/pyca/cryptography/openssl/certs"
+_CRYPTOGRAPHY_MANYLINUX_CA_FILE = b"/opt/pyca/cryptography/openssl/cert.pem"
class Error(Exception):
@@ -872,8 +872,8 @@ class Context(object):
# to the exact values we use in our manylinux1 builds. If they are
# then we know to load the fallbacks
if (
- default_dir == _CRYPTOGRAPHY_MANYLINUX1_CA_DIR
- and default_file == _CRYPTOGRAPHY_MANYLINUX1_CA_FILE
+ default_dir == _CRYPTOGRAPHY_MANYLINUX_CA_DIR
+ and default_file == _CRYPTOGRAPHY_MANYLINUX_CA_FILE
):
# This is manylinux1, let's load our fallback paths
self._fallback_default_verify_paths(
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index 3e424b6..ccc8a38 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -1214,8 +1214,8 @@ class TestContext(object):
def test_fallback_default_verify_paths(self, monkeypatch):
"""
Test that we load certificates successfully on linux from the fallback
- path. To do this we set the _CRYPTOGRAPHY_MANYLINUX1_CA_FILE and
- _CRYPTOGRAPHY_MANYLINUX1_CA_DIR vars to be equal to whatever the
+ path. To do this we set the _CRYPTOGRAPHY_MANYLINUX_CA_FILE and
+ _CRYPTOGRAPHY_MANYLINUX_CA_DIR vars to be equal to whatever the
current OpenSSL default is and we disable
SSL_CTX_SET_default_verify_paths so that it can't find certs unless
it loads via fallback.
@@ -1226,12 +1226,12 @@ class TestContext(object):
)
monkeypatch.setattr(
SSL,
- "_CRYPTOGRAPHY_MANYLINUX1_CA_FILE",
+ "_CRYPTOGRAPHY_MANYLINUX_CA_FILE",
_ffi.string(_lib.X509_get_default_cert_file()),
)
monkeypatch.setattr(
SSL,
- "_CRYPTOGRAPHY_MANYLINUX1_CA_DIR",
+ "_CRYPTOGRAPHY_MANYLINUX_CA_DIR",
_ffi.string(_lib.X509_get_default_cert_dir()),
)
context.set_default_verify_paths()