Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 31, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/OpenSSL/SSL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions tests/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down