X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fencryption_test.cc;h=c35907510efd074dd52f040abf41ddb1acb51e93;hb=d0ed9dd836b270d6bf75b302535de0f0f8f376e5;hp=c176f208da2272550d2415c888d56223dda481a7;hpb=9e523d8a4062ad52330dff6c2ba50e54184c9bb2;p=libdcp.git diff --git a/test/encryption_test.cc b/test/encryption_test.cc index c176f208..c3590751 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -1,27 +1,40 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ -#include "KM_util.h" #include "metadata.h" -#include "certificates.h" +#include "certificate.h" #include "dcp.h" -#include "signer.h" +#include "certificate_chain.h" #include "cpl.h" #include "mono_picture_asset.h" #include "picture_asset_writer.h" @@ -35,10 +48,13 @@ #include "reel_sound_asset.h" #include "encrypted_kdm.h" #include "decrypted_kdm.h" +#include #include #include #include +using std::vector; +using std::string; using boost::shared_ptr; /** Load a certificate chain from build/test/data/ *.pem and then build @@ -49,7 +65,7 @@ BOOST_AUTO_TEST_CASE (encryption_test) boost::filesystem::remove_all ("build/test/signer"); boost::filesystem::create_directory ("build/test/signer"); - Kumu::libdcp_test = true; + Kumu::cth_test = true; dcp::MXFMetadata mxf_metadata; mxf_metadata.company_name = "OpenDCP"; @@ -57,6 +73,7 @@ BOOST_AUTO_TEST_CASE (encryption_test) mxf_metadata.product_version = "0.0.25"; dcp::XMLMetadata xml_metadata; + xml_metadata.annotation_text = "A Test DCP"; xml_metadata.issuer = "OpenDCP 0.0.25"; xml_metadata.creator = "OpenDCP 0.0.25"; xml_metadata.issue_date = "2012-07-17T04:45:18+00:00"; @@ -66,37 +83,31 @@ BOOST_AUTO_TEST_CASE (encryption_test) dcp::DCP d ("build/test/DCP/encryption_test"); /* Use test/ref/crypt so this test is repeatable */ - dcp::CertificateChain chain; - chain.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); - chain.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); - chain.add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); - - shared_ptr signer ( - new dcp::Signer ( - chain, - dcp::file_to_string ("test/ref/crypt/leaf.key") - ) - ); + shared_ptr signer (new dcp::CertificateChain ()); + signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem"))); + signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem"))); + signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"))); + signer->set_key (dcp::file_to_string ("test/ref/crypt/leaf.key")); shared_ptr cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); dcp::Key key; - shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); + shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); mp->set_metadata (mxf_metadata); mp->set_key (key); - shared_ptr writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", dcp::SMPTE, false); + shared_ptr writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", false); dcp::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { writer->write (j2c.data (), j2c.size ()); } writer->finalize (); - shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1)); + shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); ms->set_metadata (mxf_metadata); ms->set_key (key); - shared_ptr sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", dcp::SMPTE); + shared_ptr sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf"); SF_INFO info; info.format = 0; @@ -126,19 +137,20 @@ BOOST_AUTO_TEST_CASE (encryption_test) d.add (cpl); + xml_metadata.annotation_text = "Created by libdcp"; d.write_xml (dcp::SMPTE, xml_metadata, signer); dcp::DecryptedKDM kdm ( cpl, key, - dcp::LocalTime ("2013-01-01T00:00:00+00:00"), + dcp::LocalTime ("2016-01-01T00:00:00+00:00"), dcp::LocalTime ("2017-01-08T00:00:00+00:00"), "libdcp", "test", "2012-07-17T04:45:18+00:00" ); - kdm.encrypt (signer, signer->certificates().leaf(), dcp::MODIFIED_TRANSITIONAL_1).as_xml ("build/test/encryption_test.kdm.xml"); + kdm.encrypt (signer, signer->leaf(), vector(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml ("build/test/encryption_test.kdm.xml"); int r = system ( "xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/encryption_test.kdm.xml "