File tree 2 files changed +3
-15
lines changed
2 files changed +3
-15
lines changed Original file line number Diff line number Diff line change @@ -1031,13 +1031,7 @@ def set_default_verify_paths(self) -> None:
1031
1031
# First we'll check to see if any env vars have been set. If so,
1032
1032
# we won't try to do anything else because the user has set the path
1033
1033
# themselves.
1034
- dir_env_var = _ffi .string (_lib .X509_get_default_cert_dir_env ()).decode (
1035
- "ascii"
1036
- )
1037
- file_env_var = _ffi .string (
1038
- _lib .X509_get_default_cert_file_env ()
1039
- ).decode ("ascii" )
1040
- if not self ._check_env_vars_set (dir_env_var , file_env_var ):
1034
+ if not self ._check_env_vars_set ("SSL_CERT_DIR" , "SSL_CERT_FILE" ):
1041
1035
default_dir = _ffi .string (_lib .X509_get_default_cert_dir ())
1042
1036
default_file = _ffi .string (_lib .X509_get_default_cert_file ())
1043
1037
# Now we check to see if the default_dir and default_file are set
Original file line number Diff line number Diff line change @@ -1283,14 +1283,8 @@ def test_verify_no_fallback_if_env_vars_set(
1283
1283
monkeypatch .setattr (
1284
1284
_lib , "SSL_CTX_set_default_verify_paths" , lambda x : 1
1285
1285
)
1286
- dir_env_var = _ffi .string (_lib .X509_get_default_cert_dir_env ()).decode (
1287
- "ascii"
1288
- )
1289
- file_env_var = _ffi .string (
1290
- _lib .X509_get_default_cert_file_env ()
1291
- ).decode ("ascii" )
1292
- monkeypatch .setenv (dir_env_var , "value" )
1293
- monkeypatch .setenv (file_env_var , "value" )
1286
+ monkeypatch .setenv ("SSL_CERT_DIR" , "value" )
1287
+ monkeypatch .setenv ("SSL_CERT_FILE" , "value" )
1294
1288
context .set_default_verify_paths ()
1295
1289
1296
1290
monkeypatch .setattr (
You can’t perform that action at this time.
0 commit comments