GitHub/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-05-08 10:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Missed a couple of places that needed to change SSL_CERT_FILE to SSL_CERT_DIR

Browse Source
This commit is contained in:
Kovid Goyal
2026-05-08 14:39:07 +05:30
parent 7790a9709f
commit b09d30a660
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bypy/macos/util.c
+1 -1
View File
@@ -17,7 +17,7 @@ set_env_vars(const char* contents_path) {
for (size_t i = 0; i < arraysz(env_vars); i++) {
env_var = env_vars[i]; val = env_var_vals[i];
if (strcmp(env_var, "SSL_CERT_FILE") == 0 && getenv("CALIBRE_USE_SYSTEM_CERTIFICATES") && strcmp(getenv("CALIBRE_USE_SYSTEM_CERTIFICATES"), "1") == 0) continue;
if (strcmp(env_var, "SSL_CERT_DIR") == 0 && getenv("CALIBRE_USE_SYSTEM_CERTIFICATES") && strcmp(getenv("CALIBRE_USE_SYSTEM_CERTIFICATES"), "1") == 0) continue;
if (strstr(val, EXE) == val && strlen(val) >= sizeof(EXE)) {
snprintf(buf, sizeof(buf) - 1, "%s%s", contents_path, val + sizeof(EXE) - 1);
setenv(env_var, buf, 1);
src/calibre/constants.py
+2 -2
View File
@@ -522,12 +522,12 @@ def sanitize_env_vars():
elif iswindows:
env_vars = {'OPENSSL_MODULES': None, 'QTWEBENGINE_DISABLE_SANDBOX': None}
if os.environ.get('CALIBRE_USE_SYSTEM_CERTIFICATES', '') != '1':
env_vars['SSL_CERT_FILE'] = None
env_vars['SSL_CERT_DIR'] = None
elif ismacos:
env_vars = {k:None for k in (
'FONTCONFIG_FILE FONTCONFIG_PATH OPENSSL_ENGINES OPENSSL_MODULES').split()}
if os.environ.get('CALIBRE_USE_SYSTEM_CERTIFICATES', '') != '1':
env_vars['SSL_CERT_FILE'] = None
env_vars['SSL_CERT_DIR'] = None
else:
env_vars = {}