X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fencryption_test.cc;h=bab209589abc3bc46ca785332618d2657d83a275;hb=4d225c4772e160131c914258655492b9cb2e466b;hp=299e5f9bdd02cff64a9dc55c7f584bc87233fcd9;hpb=fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc;p=libdcp.git

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 299e5f9b..bab20958 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -19,9 +19,9 @@
 
 #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"
@@ -41,14 +41,14 @@
 
 using boost::shared_ptr;
 
-/* Load a certificate chain from build/test/data/ *.pem and then build
-   an encrypted DCP and a KDM using it.
-*/
+/** Load a certificate chain from build/test/data/ *.pem and then build
+ *  an encrypted DCP and a KDM using it.
+ */
 BOOST_AUTO_TEST_CASE (encryption_test)
 {
 	boost::filesystem::remove_all ("build/test/signer");
 	boost::filesystem::create_directory ("build/test/signer");
-	
+
 	Kumu::libdcp_test = true;
 
 	dcp::MXFMetadata mxf_metadata;
@@ -60,28 +60,22 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	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 */
-	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<dcp::Signer> signer (
-		new dcp::Signer (
-			chain,
-			dcp::file_to_string ("test/ref/crypt/leaf.key")
-			)
-		);
+	shared_ptr<dcp::CertificateChain> 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<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
 
 	dcp::Key key;
-	
+
 	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
 	mp->set_metadata (mxf_metadata);
 	mp->set_key (key);
@@ -94,9 +88,10 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	writer->finalize ();
 
 	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
+	ms->set_metadata (mxf_metadata);
 	ms->set_key (key);
 	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", dcp::SMPTE);
-	
+
 	SF_INFO info;
 	info.format = 0;
 	SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info);
@@ -111,8 +106,8 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 			break;
 		}
 	}
-	
-	sound_writer->finalize ();	
+
+	sound_writer->finalize ();
 
 	cpl->add (shared_ptr<dcp::Reel> (new dcp::Reel (
 						 shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
@@ -122,10 +117,8 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	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);
-	
+
 	d.add (cpl);
-	d.add (mp);
-	d.add (ms);
 
 	d.write_xml (dcp::SMPTE, xml_metadata, signer);
 
@@ -139,19 +132,19 @@ BOOST_AUTO_TEST_CASE (encryption_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(), dcp::MODIFIED_TRANSITIONAL_1).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 "
 		"> build/test/xmllint.log 2>&1 < /dev/null"
 		);
 
-#ifdef LIBDCP_POSIX	
+#ifdef LIBDCP_POSIX
 	BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0);
 #else
 	BOOST_CHECK_EQUAL (r, 0);
-#endif	
-		
+#endif
+
 	r = system ("xmlsec1 verify "
 		"--pubkey-cert-pem test/ref/crypt/leaf.signed.pem "
 		"--trusted-pem test/ref/crypt/intermediate.signed.pem "
@@ -159,10 +152,10 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 		"--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");
-	
-#ifdef LIBDCP_POSIX	
+
+#ifdef LIBDCP_POSIX
 	BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0);
 #else
 	BOOST_CHECK_EQUAL (r, 0);
-#endif	
+#endif
 }