diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-11 22:04:14 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-13 11:51:49 +0200 |
| commit | b414cf496203470da9b32b1dd65f3a8f48c9124b (patch) | |
| tree | 62da82ef1f980537ffcb31272f88def292858ce9 | |
| parent | 1ca20a04d30764f689345e23c22ab49bc6990ec8 (diff) | |
Download Barco certificates using SFTP instead of plain FTP (#2842).
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/internet.cc | 2 | ||||
| -rw-r--r-- | src/wx/barco_alchemy_certificate_panel.cc | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -785,6 +785,8 @@ def package_rpm(target, cpu, version, options): requires = None if target.distro == 'mageia': requires = "lib64xmlsec1-devel lib64canberra-gtk0 libcap-utils" + if target.distro == 'fedora': + requires = "libcurl-full" make_spec('dcpomatic2.spec', version, target, options, requires) cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir diff --git a/src/lib/internet.cc b/src/lib/internet.cc index 1f280dc5d..8c5b99e61 100644 --- a/src/lib/internet.cc +++ b/src/lib/internet.cc @@ -110,6 +110,8 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp) if (!pasv) { curl_easy_setopt (curl, CURLOPT_FTPPORT, "-"); } + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); /* Maximum time is 20s */ curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20); diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc index 19bd18a8d..73b221466 100644 --- a/src/wx/barco_alchemy_certificate_panel.cc +++ b/src/wx/barco_alchemy_certificate_panel.cc @@ -62,7 +62,7 @@ BarcoAlchemyCertificatePanel::do_download () string serial = wx_to_std (_serial->GetValue()); trim(serial); string url = String::compose ( - "ftp://%1:%2@certificates.barco.com/%3xxx/%4/Barco-ICMP.%5_cert.pem", + "sftp://%1:%2@certificates.barco.com/%3xxx/%4/Barco-ICMP.%5_cert.pem", Config::instance()->barco_username().get(), Config::instance()->barco_password().get(), serial.substr(0, 7), |