X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fencryption_test.cc;h=a817d24606b0a04ae084e23c4a99823bd39ee882;hb=89d5fe15b399eae5afad0b856f2d7b267a1c86c0;hp=0f3aa69e866bd2eb43ab63a753d39924006e20b7;hpb=0f09e4f7335fb125273aa3d1dc397797a2eba1dd;p=libdcp.git

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 0f3aa69e..a817d246 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -1,27 +1,26 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 */
 
-#include "KM_util.h"
 #include "metadata.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 +34,12 @@
 #include "reel_sound_asset.h"
 #include "encrypted_kdm.h"
 #include "decrypted_kdm.h"
+#include <asdcp/KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/shared_ptr.hpp>
 
+using std::vector;
 using boost::shared_ptr;
 
 /** Load a certificate chain from build/test/data/ *.pem and then build
@@ -49,7 +50,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";
@@ -66,17 +67,11 @@ 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<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));
 
@@ -138,7 +133,7 @@ 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(), vector<dcp::Certificate>(), 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 "