X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fencryption_test.cc;h=93cea8dc396272b297e5c442163c269b33e9ec73;hb=refs%2Fheads%2Ftests-on-all-platforms;hp=64b4ecd915aab1d6926655b5f0d5fb9d84c9a221;hpb=e2a4e0f08c9e8cc82fb20f1cd358897fae46c9ee;p=libdcp.git diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 64b4ecd9..93cea8dc 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of libdcp. @@ -15,6 +15,20 @@ You should have received a copy of the GNU General Public License 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 "metadata.h" @@ -28,7 +42,6 @@ #include "sound_asset.h" #include "reel.h" #include "test.h" -#include "file.h" #include "subtitle_asset.h" #include "reel_mono_picture_asset.h" #include "reel_sound_asset.h" @@ -37,10 +50,14 @@ #include #include #include -#include +#include + using std::vector; -using boost::shared_ptr; +using std::string; +using std::shared_ptr; +using std::make_shared; + /** Load a certificate chain from build/test/data/ *.pem and then build * an encrypted DCP and a KDM using it. @@ -50,59 +67,53 @@ BOOST_AUTO_TEST_CASE (encryption_test) boost::filesystem::remove_all ("build/test/signer"); boost::filesystem::create_directory ("build/test/signer"); - Kumu::cth_test = true; + RNGFixer fix; dcp::MXFMetadata mxf_metadata; mxf_metadata.company_name = "OpenDCP"; mxf_metadata.product_name = "OpenDCP"; 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"; - boost::filesystem::remove_all ("build/test/DCP/encryption_test"); boost::filesystem::create_directories ("build/test/DCP/encryption_test"); dcp::DCP d ("build/test/DCP/encryption_test"); /* Use test/ref/crypt so this test is repeatable */ - 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")); + auto signer = make_shared(); + 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)); + auto cpl = make_shared("A Test DCP", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); dcp::Key key; - shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); + auto mp = make_shared(dcp::Fraction (24, 1), dcp::Standard::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); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + auto writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", false); + dcp::ArrayData j2c ("test/data/flat_red.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)); + auto ms = make_shared(dcp::Fraction (24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::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); + auto sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf"); SF_INFO info; info.format = 0; - SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info); + auto sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info); BOOST_CHECK (sndfile); float buffer[4096*6]; float* channels[1]; channels[0] = buffer; - while (1) { - sf_count_t N = sf_readf_float (sndfile, buffer, 4096); + while (true) { + auto N = sf_readf_float (sndfile, buffer, 4096); sound_writer->write (channels, N); if (N < 4096) { break; @@ -111,41 +122,50 @@ BOOST_AUTO_TEST_CASE (encryption_test) sound_writer->finalize (); - cpl->add (shared_ptr (new dcp::Reel ( - shared_ptr (new dcp::ReelMonoPictureAsset (mp, 0)), - shared_ptr (new dcp::ReelSoundAsset (ms, 0)), - shared_ptr () - ))); - cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_metadata (xml_metadata); + cpl->add (make_shared( + make_shared(mp, 0), + make_shared(ms, 0), + shared_ptr() + )); + cpl->set_content_version ( + dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00") + ); + cpl->set_annotation_text ("A Test DCP"); + cpl->set_issuer ("OpenDCP 0.0.25"); + cpl->set_creator ("OpenDCP 0.0.25"); + cpl->set_issue_date ("2012-07-17T04:45:18+00:00"); d.add (cpl); - xml_metadata.annotation_text = "Created by libdcp"; - d.write_xml (dcp::SMPTE, xml_metadata, signer); + d.set_issuer("OpenDCP 0.0.25"); + d.set_creator("OpenDCP 0.0.25"); + d.set_issue_date("2012-07-17T04:45:18+00:00"); + d.set_annotation_text("Created by libdcp"); + d.write_xml(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->leaf(), vector(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml ("build/test/encryption_test.kdm.xml"); + kdm.encrypt (signer, signer->leaf(), vector(), dcp::Formulation::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 " +#ifndef LIBDCP_WINDOWS "> build/test/xmllint.log 2>&1 < /dev/null" +#endif ); -#ifdef LIBDCP_POSIX - BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); -#else +#ifdef LIBDCP_WINDOWS BOOST_CHECK_EQUAL (r, 0); +#else + BOOST_CHECK_EQUAL (WEXITSTATUS(r), 0); #endif r = system ("xmlsec1 verify " @@ -153,12 +173,16 @@ BOOST_AUTO_TEST_CASE (encryption_test) "--trusted-pem test/ref/crypt/intermediate.signed.pem " "--trusted-pem test/ref/crypt/ca.self-signed.pem " "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPublic " - "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate " - "build/test/encryption_test.kdm.xml > build/test/xmlsec1.log 2>&1 < /dev/null"); + "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate --crypto openssl " + "build/test/encryption_test.kdm.xml " +#ifndef LIBDCP_WINDOWS + "> build/test/xmlsec1.log 2>&1 < /dev/null" +#endif + ); -#ifdef LIBDCP_POSIX - BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); -#else +#ifdef LIBDCP_WINDOWS BOOST_CHECK_EQUAL (r, 0); +#else + BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); #endif }