From: Carl Hetherington <cth@carlh.net>
Date: Wed, 15 Aug 2018 09:10:19 +0000 (+0100)
Subject: Christie fixes.
X-Git-Tag: v2.13.43~24^2~5
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=c3fc23c2670ae6377ef42a4e4af051d47b88e75d;p=dcpomatic.git

Christie fixes.
---

diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 53d815bf7..fa91cc2b5 100644
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -44,26 +44,24 @@ ChristieCertificatePanel::do_download ()
 		return;
 	}
 
-	string const serial = wx_to_std (_serial->GetValue());
-	string const url = String::compose (
-		"ftp://%1:%2@certificates.christiedigital.com/Certificates/F-IMB/F-IMB_000000%3_sha256.pem",
+	string const prefix = String::compose(
+		"ftp://%1:%2@certificates.christiedigital.com/Certificates/",
 		Config::instance()->christie_username().get(),
-		Config::instance()->christie_password().get(),
-		serial
+		Config::instance()->christie_password().get()
 		);
 
+	string serial = wx_to_std (_serial->GetValue());
+	serial.insert (0, 12 - serial.length(), '0');
+
+	string const url = String::compose ("%1F-IMB/F-IMB_%2_sha256.pem", prefix, serial);
+
 	optional<string> all_errors;
 
 	optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
 	if (error) {
 		all_errors = *error;
 
-		string const url = String::compose (
-			"ftp://%1:%2@certificates.christiedigital.com/Certificates/F-IMB/F-IMB_000000%3_sha256.pem",
-			Config::instance()->christie_username().get(),
-			Config::instance()->christie_password().get(),
-			serial
-			);
+		string const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
 
 		error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
 		if (error) {