From d82b212d3393c145a1722529b5d5b01cf65fd9bf Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sun, 27 Oct 2024 18:27:11 +0100 Subject: [PATCH] libstore: remove FileTransferRequest::verifyTLS it's never set to false. Change-Id: I1e436c82f1097091a08faa1dfada75e51bd5edf9 --- src/libstore/filetransfer.cc | 9 ++------- src/libstore/filetransfer.hh | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 21fe5715e..f4ce04081 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -312,13 +312,8 @@ struct curlFileTransfer : public FileTransfer curl_easy_setopt(req, CURLOPT_INFILESIZE_LARGE, (curl_off_t) uploadData->length()); } - 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()); curl_easy_setopt(req, CURLOPT_CONNECTTIMEOUT, fileTransferSettings.connectTimeout.get()); diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh index e246eab80..86c772fb1 100644 --- a/src/libstore/filetransfer.hh +++ b/src/libstore/filetransfer.hh @@ -57,7 +57,6 @@ struct FileTransferRequest std::string uri; Headers headers; std::string expectedETag; - bool verifyTLS = true; FileTransferRequest(std::string_view uri) : uri(uri) { }