diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-10 10:11:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-10 10:11:24 +0100 |
| commit | 9394dad74a8439f8230eb6aa21b639f3e10cbb2a (patch) | |
| tree | a07d0292f0dfa4c6796386fba1e870a00b501970 /src | |
| parent | 55f5142794f423e70daa4d5b3a4602029172a127 (diff) | |
Write encryption test all to the right place. Some more XML writes unformatted to fix digests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpl.cc | 3 | ||||
| -rw-r--r-- | src/dcp.cc | 7 |
2 files changed, 6 insertions, 4 deletions
@@ -237,7 +237,8 @@ CPL::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr<const Sig signer->sign (root, interop); } - doc.write_to_file_formatted (p.string (), "UTF-8"); + /* This must not be the _formatted version otherwise signature digests will be wrong */ + doc.write_to_file (p.string (), "UTF-8"); _digest = make_digest (p.string (), 0); _length = boost::filesystem::file_size (p.string ()); @@ -124,7 +124,7 @@ DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, sha signer->sign (pkl, interop); } - doc.write_to_file_formatted (p.string (), "UTF-8"); + doc.write_to_file (p.string (), "UTF-8"); return p.string (); } @@ -138,7 +138,7 @@ DCP::write_volindex () const xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM"); root->add_child("Index")->add_child_text ("1"); - doc.write_to_file_formatted (p.string (), "UTF-8"); + doc.write_to_file (p.string (), "UTF-8"); } void @@ -191,7 +191,8 @@ DCP::write_assetmap (string pkl_uuid, int pkl_length, bool interop, XMLMetadata (*i)->write_to_assetmap (asset_list); } - doc.write_to_file_formatted (p.string (), "UTF-8"); + /* This must not be the _formatted version otherwise signature digests will be wrong */ + doc.write_to_file (p.string (), "UTF-8"); } void |