Rename crypt_chain -> signer_chain.

5 files changed, 13 insertions, 13 deletions

diff --git a/src/crypt_chain.cc b/src/signer_chain.cc
index 2737f12c..1fa8090d 100644
--- a/src/crypt_chain.cc
+++ b/src/signer_chain.cc
@@ -21,7 +21,7 @@
 #include <sstream>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include "crypt_chain.h"
+#include "signer_chain.h"
 #include "exceptions.h"
 
 using std::string;
@@ -45,7 +45,7 @@ static void command (char const * c)
 }
 
 void
-libdcp::make_crypt_chain (boost::filesystem::path directory)
+libdcp::make_signer_chain (boost::filesystem::path directory)
 {
 	boost::filesystem::path const cwd = boost::filesystem::current_path ();
 
diff --git a/src/crypt_chain.h b/src/signer_chain.h
index 0e6667f1..ea67f7e1 100644
--- a/src/crypt_chain.h
+++ b/src/signer_chain.h
@@ -21,6 +21,6 @@
 
 namespace libdcp {
 	
-void make_crypt_chain (boost::filesystem::path);
+void make_signer_chain (boost::filesystem::path);
 
 }
diff --git a/src/wscript b/src/wscript
index 7afeb537..70fd1794 100644
--- a/src/wscript
+++ b/src/wscript
@@ -14,7 +14,6 @@ def build(bld):
                  asset.cc
                  certificates.cc
                  colour_matrix.cc
-                 crypt_chain.cc
                  cpl.cc
                  dcp.cc        
                  dcp_time.cc
@@ -30,6 +29,7 @@ def build(bld):
                  reel.cc
                  rgb_xyz.cc
                  signer.cc
+                 signer_chain.cc
                  sound_asset.cc
                  sound_frame.cc
                  srgb_linearised_gamma_lut.cc
@@ -49,7 +49,6 @@ def build(bld):
               certificates.h
               colour_matrix.h
               cpl.h
-              crypt_chain.h
               dcp.h
               dcp_time.h
               exceptions.h
@@ -67,6 +66,7 @@ def build(bld):
               rec709_linearised_gamma_lut.h
               reel.h
               argb_frame.h
+              signer_chain.h
               sound_asset.h
               sound_frame.h
               srgb_linearised_gamma_lut.h
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 11028083..1b0de19a 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -39,9 +39,9 @@ BOOST_AUTO_TEST_CASE (encryption)
 	libdcp::DCP d ("build/test/DCP/bar");
 
 	libdcp::CertificateChain chain;
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/crypt/ca.self-signed.pem")));
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/crypt/intermediate.signed.pem")));
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/crypt/leaf.signed.pem")));
+	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/signer/ca.self-signed.pem")));
+	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/signer/intermediate.signed.pem")));
+	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/signer/leaf.signed.pem")));
 
 	shared_ptr<libdcp::Signer> signer (
 		new libdcp::Signer (
diff --git a/test/tests.cc b/test/tests.cc
index 28e15cf1..5e63d5ed 100644
--- a/test/tests.cc
+++ b/test/tests.cc
@@ -31,7 +31,7 @@
 #include "sound_asset.h"
 #include "reel.h"
 #include "certificates.h"
-#include "crypt_chain.h"
+#include "signer_chain.h"
 #include "gamma_lut.h"
 #include "cpl.h"
 #include "signer.h"
@@ -84,11 +84,11 @@ static string test_corpus = "../libdcp-test";
 #include "recovery_test.cc"
 #include "certificates_test.cc"
 
-BOOST_AUTO_TEST_CASE (crypt_chain)
+BOOST_AUTO_TEST_CASE (signer_chain)
 {
-	boost::filesystem::remove_all ("build/test/crypt");
-	boost::filesystem::create_directory ("build/test/crypt");
-	libdcp::make_crypt_chain ("build/test/crypt");
+	boost::filesystem::remove_all ("build/test/signer");
+	boost::filesystem::create_directory ("build/test/signer");
+	libdcp::make_signer_chain ("build/test/signer");
 }
 
 #include "encryption_test.cc"