using std::runtime_error;
using dcp::Certificate;
-DecryptedECinemaKDM::DecryptedECinemaKDM (string id, dcp::Key content_key)
+DecryptedECinemaKDM::DecryptedECinemaKDM (string id, string name, dcp::Key content_key)
: _id (id)
+ , _name (name)
, _content_key (content_key)
{
DecryptedECinemaKDM::DecryptedECinemaKDM (EncryptedECinemaKDM kdm, string private_key)
: _id (kdm.id())
+ , _name (kdm.name())
{
/* Read the private key */
EncryptedECinemaKDM
DecryptedECinemaKDM::encrypt (Certificate recipient)
{
- return EncryptedECinemaKDM (_id, _content_key, recipient);
+ return EncryptedECinemaKDM (_id, _name, _content_key, recipient);
}
#endif
class DecryptedECinemaKDM
{
public:
- DecryptedECinemaKDM (std::string id, dcp::Key content_key);
+ DecryptedECinemaKDM (std::string id, std::string name, dcp::Key content_key);
DecryptedECinemaKDM (EncryptedECinemaKDM kdm, std::string private_key);
EncryptedECinemaKDM encrypt (dcp::Certificate recipient);
return _id;
}
+ std::string name () const {
+ return _name;
+ }
+
dcp::Key key () const {
return _content_key;
}
private:
std::string _id;
+ std::string _name;
/** unenecrypted content key */
dcp::Key _content_key;
};
{
if (node->name() == "DKDM") {
return shared_ptr<DKDM> (new DKDM (dcp::EncryptedKDM (node->content ())));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ } else if (node->name() == "ECinemaDKDM") {
+ return shared_ptr<ECinemaDKDM> (new ECinemaDKDM(EncryptedECinemaKDM(node->content())));
+#endif
} else if (node->name() == "DKDMGroup") {
shared_ptr<DKDMGroup> group (new DKDMGroup (node->string_attribute ("Name")));
BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children()) {
node->add_child("DKDM")->add_child_text (_dkdm.as_xml ());
}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+string
+ECinemaDKDM::name () const
+{
+ return String::compose ("%1 (%2)", _dkdm.name(), _dkdm.id());
+}
+
+void
+ECinemaDKDM::as_xml (xmlpp::Element* node) const
+{
+ node->add_child("ECinemaDKDM")->add_child_text (_dkdm.as_xml());
+}
+#endif
+
void
DKDMGroup::as_xml (xmlpp::Element* node) const
{
*/
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+#include "encrypted_ecinema_kdm.h"
+#endif
#include <dcp/encrypted_kdm.h>
#include <libcxml/cxml.h>
#include <boost/enable_shared_from_this.hpp>
dcp::EncryptedKDM _dkdm;
};
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+class ECinemaDKDM : public DKDMBase
+{
+public:
+ explicit ECinemaDKDM (EncryptedECinemaKDM k)
+ : _dkdm (k)
+ {}
+
+ std::string name () const;
+ void as_xml (xmlpp::Element *) const;
+
+ EncryptedECinemaKDM dkdm () const {
+ return _dkdm;
+ }
+
+private:
+ EncryptedECinemaKDM _dkdm;
+};
+#endif
+
class DKDMGroup : public DKDMBase
{
public:
#ifdef DCPOMATIC_VARIANT_SWAROOP
#include "encrypted_ecinema_kdm.h"
+#include "exceptions.h"
#include <dcp/key.h>
#include <dcp/certificate.h>
#include <dcp/util.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <openssl/rsa.h>
+#include <openssl/err.h>
#include <iostream>
using std::cout;
using boost::shared_ptr;
using dcp::Certificate;
-EncryptedECinemaKDM::EncryptedECinemaKDM (string id, dcp::Key content_key, Certificate recipient)
+EncryptedECinemaKDM::EncryptedECinemaKDM (string id, string name, dcp::Key content_key, Certificate recipient)
: _id (id)
+ , _name (name)
{
RSA* rsa = recipient.public_key ();
_content_key = dcp::Data (RSA_size(rsa));
int const N = RSA_public_encrypt (content_key.length(), content_key.value(), _content_key.data().get(), rsa, RSA_PKCS1_OAEP_PADDING);
+ if (N == -1) {
+ throw KDMError ("Could not encrypt ECinema KDM", ERR_error_string(ERR_get_error(), 0));
+ }
+
}
EncryptedECinemaKDM::EncryptedECinemaKDM (string xml)
cxml::Document doc ("ECinemaSecurityMessage");
doc.read_string (xml);
_id = doc.string_child ("Id");
+ _name = doc.string_child ("Name");
_content_key = dcp::Data (256);
int const len = dcp::base64_decode (doc.string_child("Key"), _content_key.data().get(), _content_key.size());
_content_key.set_size (len);
xmlpp::Document document;
xmlpp::Element* root = document.create_root_node ("ECinemaSecurityMessage");
root->add_child("Id")->add_child_text(_id);
+ root->add_child("Name")->add_child_text(_name);
root->add_child("Key")->add_child_text(lines);
return document.write_to_string ("UTF-8");
}
return _id;
}
+ std::string name () const {
+ return _name;
+ }
+
dcp::Data key () const {
return _content_key;
}
private:
friend class DecryptedECinemaKDM;
- EncryptedECinemaKDM (std::string id, dcp::Key key, dcp::Certificate recipient);
+ EncryptedECinemaKDM (std::string id, std::string name, dcp::Key key, dcp::Certificate recipient);
std::string _id;
+ std::string _name;
/** encrypted content key */
dcp::Data _content_key;
};
digester.cc
dkdm_wrapper.cc
dolby_cp750.cc
+ ecinema_screen_kdm.cc
edid.cc
emailer.cc
empty.cc
avformat_free_context (input_fc);
avformat_free_context (output_fc);
- DecryptedECinemaKDM decrypted_kdm (id, key);
+ DecryptedECinemaKDM decrypted_kdm (id, output_mp4.filename().string(), key);
EncryptedECinemaKDM encrypted_kdm = decrypted_kdm.encrypt (Config::instance()->decryption_chain()->leaf());
cout << encrypted_kdm.as_xml() << "\n";
}