Remove use of OpenSSL APIs that aren't useful (#1414)

Per pyca/cryptography#12223 these always return constant strings
pyca · Jan 31, 2025 · 9b8c497 · 9b8c497
1 parent 47b4e15
commit 9b8c497
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
@@ -1031,13 +1031,7 @@ def set_default_verify_paths(self) -> None:
         # First we'll check to see if any env vars have been set. If so,
         # we won't try to do anything else because the user has set the path
         # themselves.
-        dir_env_var = _ffi.string(_lib.X509_get_default_cert_dir_env()).decode(
-            "ascii"
-        )
-        file_env_var = _ffi.string(
-            _lib.X509_get_default_cert_file_env()
-        ).decode("ascii")
-        if not self._check_env_vars_set(dir_env_var, file_env_var):
+        if not self._check_env_vars_set("SSL_CERT_DIR", "SSL_CERT_FILE"):
             default_dir = _ffi.string(_lib.X509_get_default_cert_dir())
             default_file = _ffi.string(_lib.X509_get_default_cert_file())
             # Now we check to see if the default_dir and default_file are set

diff --git a/tests/test_ssl.py b/tests/test_ssl.py
@@ -1283,14 +1283,8 @@ def test_verify_no_fallback_if_env_vars_set(
         monkeypatch.setattr(
             _lib, "SSL_CTX_set_default_verify_paths", lambda x: 1
         )
-        dir_env_var = _ffi.string(_lib.X509_get_default_cert_dir_env()).decode(
-            "ascii"
-        )
-        file_env_var = _ffi.string(
-            _lib.X509_get_default_cert_file_env()
-        ).decode("ascii")
-        monkeypatch.setenv(dir_env_var, "value")
-        monkeypatch.setenv(file_env_var, "value")
+        monkeypatch.setenv("SSL_CERT_DIR", "value")
+        monkeypatch.setenv("SSL_CERT_FILE", "value")
         context.set_default_verify_paths()
 
         monkeypatch.setattr(