Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore/filetransfer: Remove verifyTLS from FileTransferRequest, since it's always true

Browse Source 
This variable is always true, so there's no use-case for it anymore.
This commit is contained in:
Sergei Zimmerman
2025-10-24 00:29:08 +03:00
parent d6f1e2de21
commit b5ae3e10c2
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstore/filetransfer.cc
View File

@@ -399,13 +399,8 @@ struct curlFileTransfer : public FileTransfer
curl_easy_setopt(req, CURLOPT_SEEKDATA, this);
}
if (request.verifyTLS) {
if (settings.caFile != "")
curl_easy_setopt(req, CURLOPT_CAINFO, settings.caFile.get().c_str());
} else {
curl_easy_setopt(req, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(req, CURLOPT_SSL_VERIFYHOST, 0);
}
if (settings.caFile != "")
curl_easy_setopt(req, CURLOPT_CAINFO, settings.caFile.get().c_str());
#if !defined(_WIN32) && LIBCURL_VERSION_NUM >= 0x071000
curl_easy_setopt(req, CURLOPT_SOCKOPTFUNCTION, cloexec_callback);

1
src/libstore/include/nix/store/filetransfer.hh
View File

@@ -99,7 +99,6 @@ struct FileTransferRequest
VerbatimURL uri;
Headers headers;
std::string expectedETag;
bool verifyTLS = true;
bool head = false;
bool post = false;
size_t tries = fileTransferSettings.tries;