X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fencryption_test.cc;h=6e145056127223288d0237b912a617233fc6c6b7;hb=f6d466eee4f1381a65da4b5f6d60924e6a81df4e;hp=4b9e525e44fd285982d276ad1e98091b007bc3d4;hpb=f9078ac398e0765e39f503cdc5bed406d45e0c36;p=libdcp.git diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 4b9e525e..6e145056 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -36,13 +36,13 @@ #include "dcp.h" #include "certificate_chain.h" #include "cpl.h" -#include "mono_picture_asset.h" -#include "picture_asset_writer.h" +#include "filesystem.h" +#include "mono_j2k_picture_asset.h" +#include "j2k_picture_asset_writer.h" #include "sound_asset_writer.h" #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" @@ -51,11 +51,14 @@ #include #include #include -#include +#include + using std::vector; using std::string; -using boost::shared_ptr; +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. @@ -72,53 +75,47 @@ BOOST_AUTO_TEST_CASE (encryption_test) 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), dcp::SMPTE)); + 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", false); - dcp::File j2c ("test/data/32x32_red_square.j2c"); + auto writer = mp->start_write("build/test/DCP/encryption_test/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + 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, dcp::SMPTE)); + 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"); + auto sound_writer = ms->start_write("build/test/DCP/encryption_test/audio.mxf", {}, dcp::SoundAsset::AtmosSync::DISABLED, dcp::SoundAsset::MCASubDescriptors::ENABLED); 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); - sound_writer->write (channels, N); + while (true) { + auto N = sf_readf_float (sndfile, buffer, 4096); + sound_writer->write(channels, 1, N); if (N < 4096) { break; } @@ -126,22 +123,26 @@ 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_issuer (xml_metadata.issuer); - cpl->set_creator (xml_metadata.creator); - cpl->set_issue_date (xml_metadata.issue_date); - cpl->set_annotation_text (xml_metadata.annotation_text); + 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, @@ -153,17 +154,24 @@ BOOST_AUTO_TEST_CASE (encryption_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"); + + /* Make sure we aren't in a UNC current working directory otherwise the use of cmd.exe + * in system() below will fail. + */ + boost::filesystem::current_path(dcp::filesystem::unfix_long_path(boost::filesystem::current_path())); 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 " @@ -171,12 +179,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 }