X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fencryption_test.cc;h=7cd202f22b5df916facca0a2fde10600e0277492;hb=9fd79fb05fa47833ed431d83d73fd6d9a4a9f774;hp=e2bf9698129cf26e6ba8fac1952218b7b5fc1f69;hpb=566608b965e8ec0e08d9de128405d22ec7fedcd6;p=libdcp.git

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index e2bf9698..7cd202f2 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -40,51 +40,51 @@ BOOST_AUTO_TEST_CASE (encryption)
 {
 	boost::filesystem::remove_all ("build/test/signer");
 	boost::filesystem::create_directory ("build/test/signer");
-	libdcp::make_signer_chain ("build/test/signer");
+	dcp::make_signer_chain ("build/test/signer", "openssl");
 	
 	Kumu::libdcp_test = true;
 
-	libdcp::MXFMetadata mxf_metadata;
+	dcp::MXFMetadata mxf_metadata;
 	mxf_metadata.company_name = "OpenDCP";
 	mxf_metadata.product_name = "OpenDCP";
 	mxf_metadata.product_version = "0.0.25";
 
-	libdcp::XMLMetadata xml_metadata;
+	dcp::XMLMetadata xml_metadata;
 	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/bar");
-	boost::filesystem::create_directories ("build/test/bar");
-	libdcp::DCP d ("build/test/DCP/bar");
+	boost::filesystem::remove_all ("build/test/DCP/bar");
+	boost::filesystem::create_directories ("build/test/DCP/bar");
+	dcp::DCP d ("build/test/DCP/bar");
 
-	libdcp::CertificateChain chain;
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/ca.self-signed.pem"))));
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/intermediate.signed.pem"))));
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/leaf.signed.pem"))));
+	dcp::CertificateChain chain;
+	chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/ca.self-signed.pem"))));
+	chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/intermediate.signed.pem"))));
+	chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (boost::filesystem::path ("build/test/signer/leaf.signed.pem"))));
 
-	shared_ptr<libdcp::Signer> signer (
-		new libdcp::Signer (
+	shared_ptr<dcp::Signer> signer (
+		new dcp::Signer (
 			chain,
-			"test/data/signer.key"
+			"build/test/signer/leaf.key"
 			)
 		);
 
-	shared_ptr<libdcp::CPL> cpl (new libdcp::CPL ("build/test/bar", "A Test DCP", libdcp::FEATURE, 24, 24));
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("build/test/DCP/bar", "A Test DCP", dcp::FEATURE, 24, 24));
 
-	libdcp::Key key;
+	dcp::Key key;
 	
-	shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/bar", "video.mxf"));
+	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset ("build/test/DCP/bar", "video.mxf"));
 	mp->set_progress (&d.Progress);
 	mp->set_edit_rate (24);
 	mp->set_intrinsic_duration (24);
 	mp->set_duration (24);
-	mp->set_size (libdcp::Size (32, 32));
+	mp->set_size (dcp::Size (32, 32));
 	mp->set_metadata (mxf_metadata);
 	mp->set_key (key);
 	mp->create (j2c);
 
-	shared_ptr<libdcp::SoundAsset> ms (new libdcp::SoundAsset ("build/test/bar", "audio.mxf"));
+	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset ("build/test/DCP/bar", "audio.mxf"));
 	ms->set_progress (&d.Progress);
 	ms->set_edit_rate (24);
 	ms->set_intrinsic_duration (24);
@@ -94,12 +94,12 @@ BOOST_AUTO_TEST_CASE (encryption)
 	ms->set_key (key);
 	ms->create (wav);
 	
-	cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ())));
+	cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (mp, ms, shared_ptr<dcp::SubtitleAsset> ())));
 	d.add_cpl (cpl);
 
 	d.write_xml (false, xml_metadata, signer);
 
-	libdcp::KDM kdm (
+	dcp::KDM kdm (
 		cpl,
 		signer,
 		signer->certificates().leaf(),
@@ -111,4 +111,11 @@ BOOST_AUTO_TEST_CASE (encryption)
 
 	kdm.as_xml ("build/test/bar.kdm.xml");
 	system ("xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/bar.kdm.xml");
+	system ("xmlsec1 verify "
+		"--pubkey-cert-pem build/test/signer/leaf.signed.pem "
+		"--trusted-pem build/test/signer/intermediate.signed.pem "
+		"--trusted-pem build/test/signer/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/bar.kdm.xml");
 }