Revert "Another attempt for ssl-cert support on RHEL/Fedora #9005"

This reverts commit b75be7f975.
This commit is contained in:
Mads Kiilerich
2022-10-22 01:24:02 +02:00
committed by Robin Gareus
parent 79f55742d6
commit 06b503d716

View File

@@ -63,6 +63,7 @@ HttpGet::ca_setopt (CURL* c)
}
if (ca_info && strlen (ca_info) == 0) {
/* not hat for you */
curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0);
} else if (ca_info || ca_path) {
@@ -102,9 +103,9 @@ HttpGet::setup_certificate_paths ()
ca_info = ""; // disable cert check
}
if (Glib::file_test ("/etc/pki/tls/certs/ca-bundle.crt", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
if (Glib::file_test ("/etc/pki/tls/certs/ca-bundle.crt", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
// we're on RHEL // https://bugzilla.redhat.com/show_bug.cgi?id=1053882
ca_path = "/nonexistent_path"; // don't try "/etc/ssl/certs" it's a trap
ca_path = "/nonexistent_path"; // don't try "/etc/ssl/certs" in case it's curl's default
}
else if (Glib::file_test ("/etc/ssl/certs", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
// Debian and derivs + OpenSuSe