X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=3547d0f59209ba6cafbe261ca3bc4423eeb761a0;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=7920f7e5756b9994c7147fd5c45bccc1fb87cd9d;hpb=5579acd7ff7e1460f0b5bb54a4deedbd356153cd;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 7920f7e57..3547d0f59 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -45,21 +45,20 @@ #include "lib/cinema.h" #include "lib/dkdm_wrapper.h" #include "lib/cross.h" -#ifdef DCPOMATIC_VARIANT_SWAROOP -#include "lib/decrypted_ecinema_kdm.h" -#endif #include #include #include +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include #include #include +DCPOMATIC_ENABLE_WARNINGS #ifdef __WXOSX__ #include #endif -#include -#include +#include #ifdef check #undef check @@ -71,11 +70,14 @@ using std::string; using std::vector; using std::pair; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; using boost::ref; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; enum { @@ -305,47 +307,7 @@ private: list kdms; string title; -#ifdef DCPOMATIC_VARIANT_SWAROOP - shared_ptr ecinema_dkdm = boost::dynamic_pointer_cast (dkdm_base); - if (ecinema_dkdm) { - DecryptedECinemaKDM decrypted (ecinema_dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); - title = decrypted.name (); - - BOOST_FOREACH (shared_ptr i, _screens->screens()) { - - if (!i->recipient) { - continue; - } - - dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); - dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); - - DecryptedECinemaKDM kdm ( - decrypted.id(), - decrypted.name(), - decrypted.key(), - begin, - end - ); - - dcp::NameFormat::Map name_values; - name_values['c'] = i->cinema->name; - name_values['s'] = i->name; - name_values['f'] = title; - name_values['b'] = begin.date() + " " + begin.time_of_day(true, false); - name_values['e'] = end.date() + " " + end.time_of_day(true, false); - - /* Encrypt */ - kdms.push_back ( - KDMWithMetadataPtr( - new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get())) - ) - ); - } - } -#endif - - shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); + shared_ptr dkdm = std::dynamic_pointer_cast (dkdm_base); if (dkdm) { /* Decrypt the DKDM */ @@ -358,7 +320,7 @@ private: throw InvalidSignerError (); } - BOOST_FOREACH (shared_ptr i, _screens->screens()) { + for (auto i: _screens->screens()) { if (!i->recipient) { continue; @@ -377,28 +339,27 @@ private: ); /* Add keys from the DKDM */ - BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) { + for (auto const& j: decrypted.keys()) { kdm.add_key (j); } + dcp::EncryptedKDM const encrypted = kdm.encrypt( + signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), + !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional() : 0 + ); + dcp::NameFormat::Map name_values; name_values['c'] = i->cinema->name; name_values['s'] = i->name; name_values['f'] = title; 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'] = encrypted.cpl_id (); /* Encrypt */ kdms.push_back ( KDMWithMetadataPtr( - new DCPKDMWithMetadata( - name_values, - i->cinema, - kdm.encrypt( - signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), - !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional() : 0 - ) - ) + new KDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, encrypted) ) ); } @@ -488,44 +449,6 @@ private: shared_ptr chain = Config::instance()->decryption_chain(); DCPOMATIC_ASSERT (chain->key()); -#ifdef DCPOMATIC_VARIANT_SWAROOP - try { - cxml::Document test_doc; - string const xml_string = dcp::file_to_string (wx_to_std(d->GetPath()), MAX_KDM_SIZE); - test_doc.read_string (xml_string); - if (test_doc.root_name() == "ECinemaSecurityMessage") { - EncryptedECinemaKDM ekdm(xml_string); - /* Decrypt the DKDM to make sure that we can */ - DecryptedECinemaKDM dkdm(ekdm, chain->key().get()); - - shared_ptr new_dkdm(new ECinemaDKDM(ekdm)); - shared_ptr group = dynamic_pointer_cast (selected_dkdm()); - if (!group) { - group = Config::instance()->dkdms(); - } - add_dkdm_model (new_dkdm, group); - add_dkdm_view (new_dkdm); - d->Destroy (); - return; - } - } catch (KDMError& e) { - error_dialog ( - this, "Could not read file as a KDM. Perhaps it is badly formatted, created with the wrong certificate, or not a KDM at all.", - std_to_wx(e.what()) - ); - d->Destroy (); - return; - } catch (dcp::MiscError& e) { - error_dialog ( - this, - _("Could not read file as a KDM. It is much too large. Make sure you are loading a DKDM (XML) file."), - std_to_wx(e.what()) - ); - d->Destroy (); - return; - } -#endif - try { dcp::EncryptedKDM ekdm(dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)); /* Decrypt the DKDM to make sure that we can */ @@ -598,7 +521,7 @@ private: /* Add children */ shared_ptr g = dynamic_pointer_cast (base); if (g) { - BOOST_FOREACH (shared_ptr i, g->children()) { + for (auto i: g->children()) { add_dkdm_view (i); } } @@ -672,7 +595,7 @@ private: ScreensPanel* _screens; KDMTimingPanel* _timing; wxTreeCtrl* _dkdm; - typedef std::map > DKDMMap; + typedef std::map > DKDMMap; DKDMMap _dkdm_id; wxButton* _add_dkdm; wxButton* _add_dkdm_folder; @@ -718,10 +641,8 @@ private: unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); +#ifdef DCPOMATIC_OSX + make_foreground_application (); #endif dcpomatic_setup_path_encoding ();