Try to set both a CA bundle file and directory

AppImage · May 5, 2024 · e7c0ca0 · e7c0ca0
1 parent 1ac7359
commit e7c0ca0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/appimagetool_fetch_runtime.cpp b/src/appimagetool_fetch_runtime.cpp
@@ -172,15 +172,17 @@ class GetRequest {
 #warning "libcurl version too old, not trying to use default values for system-provided CA certificate bundles"
 #endif
 
+        bool found = false;
+
         {
             const auto chainFile = findCaBundleFile();
             if (!chainFile.empty()) {
                 if (verbose) {
                     std::cerr << "Using CA bundle file in " << chainFile << std::endl;
                 }
                 setOption(CURLOPT_CAINFO, chainFile.c_str());
-                return;
             }
+            found = true;
         }
 
         {
@@ -190,11 +192,13 @@ class GetRequest {
                     std::cerr << "Using CA bundle file in " << chainDir << std::endl;
                 }
                 setOption(CURLOPT_CAINFO, chainDir.c_str());
-                return;
             }
+            found = true;
         }
 
-        std::cerr << "Warning: could not find valid CA chain bundle, HTTPS requests will likely fail" << std::endl;
+        if (!found) {
+            std::cerr << "Warning: could not find valid CA chain bundle, HTTPS requests will likely fail" << std::endl;
+        }
     }
 
 public: