*/
-#include "screen.h"
-#include "kdm_with_metadata.h"
-#include "film.h"
#include "cinema.h"
+#include "config.h"
+#include "film.h"
+#include "kdm_util.h"
+#include "kdm_with_metadata.h"
+#include "screen.h"
#include <libxml++/libxml++.h>
#include <boost/algorithm/string.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
KDMWithMetadataPtr
kdm_for_screen (
- shared_ptr<const Film> film,
- boost::filesystem::path cpl,
+ std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm,
shared_ptr<const dcpomatic::Screen> screen,
boost::posix_time::ptime valid_from,
boost::posix_time::ptime valid_to,
dcp::Formulation formulation,
bool disable_forensic_marking_picture,
- optional<int> disable_forensic_marking_audio
+ optional<int> disable_forensic_marking_audio,
+ vector<KDMCertificatePeriod>& period_checks
)
{
if (!screen->recipient) {
}
auto cinema = screen->cinema;
- dcp::LocalTime const begin(valid_from, cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0);
- dcp::LocalTime const end (valid_to, cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0);
-
- auto const kdm = film->make_kdm (
- screen->recipient.get(),
- screen->trusted_device_thumbprints(),
- cpl,
- begin,
- end,
- formulation,
- disable_forensic_marking_picture,
- disable_forensic_marking_audio
- );
+ dcp::LocalTime const begin(valid_from, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
+ dcp::LocalTime const end (valid_to, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
+
+ period_checks.push_back(check_kdm_and_certificate_validity_periods(cinema ? cinema->name : "", screen->name, screen->recipient.get(), begin, end));
+
+ auto signer = Config::instance()->signer_chain();
+ if (!signer->valid()) {
+ throw InvalidSignerError();
+ }
+
+ auto kdm = make_kdm(begin, end).encrypt(
+ signer, screen->recipient.get(), screen->trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
+ );
dcp::NameFormat::Map name_values;
if (cinema) {
name_values['c'] = cinema->name;
+ } else {
+ name_values['c'] = "";
}
name_values['s'] = screen->name;
- name_values['f'] = film->name();
+ name_values['f'] = kdm.content_title_text();
name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
name_values['e'] = end.date() + " " + end.time_of_day(true, false);
name_values['i'] = kdm.cpl_id();
- return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : list<string>(), kdm);
+ return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : vector<string>(), kdm);
}