Rename Config::_signer to Config::_signer_chain.

4 files changed, 13 insertions, 14 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b75791a45..7e3de966b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -120,7 +120,7 @@ Config::read ()
 {
 	if (!boost::filesystem::exists (file ())) {
 		/* Make a new set of signing certificates and key */
-		_signer.reset (new dcp::CertificateChain (openssl_path ()));
+		_signer_chain.reset (new dcp::CertificateChain (openssl_path ()));
 		/* And decryption keys */
 		make_decryption_keys ();
 		return;
@@ -233,7 +233,6 @@ Config::read ()
 	}
 
 	cxml::NodePtr signer = f.optional_node_child ("Signer");
-	dcp::CertificateChain signer_chain;
 	if (signer) {
 		shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
 		/* Read the signing certificates and private key in from the config file */
@@ -242,10 +241,10 @@ Config::read ()
 			c->add (dcp::Certificate ((*i)->content ()));
 		}
 		c->set_key (signer->string_child ("PrivateKey"));
-		_signer = c;
+		_signer_chain = c;
 	} else {
 		/* Make a new set of signing certificates and key */
-		_signer.reset (new dcp::CertificateChain (openssl_path ()));
+		_signer_chain.reset (new dcp::CertificateChain (openssl_path ()));
 	}
 
 	if (f.optional_string_child ("DecryptionCertificate")) {
@@ -379,11 +378,11 @@ Config::write () const
 #endif
 
 	xmlpp::Element* signer = root->add_child ("Signer");
-	dcp::CertificateChain::List certs = _signer->root_to_leaf ();
+	dcp::CertificateChain::List certs = _signer_chain->root_to_leaf ();
 	for (dcp::CertificateChain::List::const_iterator i = certs.begin(); i != certs.end(); ++i) {
 		signer->add_child("Certificate")->add_child_text (i->certificate (true));
 	}
-	signer->add_child("PrivateKey")->add_child_text (_signer->key().get ());
+	signer->add_child("PrivateKey")->add_child_text (_signer_chain->key().get ());
 
 	root->add_child("DecryptionCertificate")->add_child_text (_decryption_certificate.certificate (true));
 	root->add_child("DecryptionPrivateKey")->add_child_text (_decryption_private_key);
diff --git a/src/lib/config.h b/src/lib/config.h
index 913c2abc3..573d2b292 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -199,8 +199,8 @@ public:
 		return _kdm_email;
 	}
 
-	boost::shared_ptr<const dcp::CertificateChain> signer () const {
-		return _signer;
+	boost::shared_ptr<const dcp::CertificateChain> signer_chain () const {
+		return _signer_chain;
 	}
 
 	dcp::Certificate decryption_certificate () const {
@@ -376,8 +376,8 @@ public:
 
 	void reset_kdm_email ();
 
-	void set_signer (boost::shared_ptr<const dcp::CertificateChain> s) {
-		maybe_set (_signer, s);
+	void set_signer_chain (boost::shared_ptr<const dcp::CertificateChain> s) {
+		maybe_set (_signer_chain, s);
 	}
 
 	void set_decryption_certificate (dcp::Certificate c) {
@@ -489,7 +489,7 @@ private:
 	std::string _kdm_cc;
 	std::string _kdm_bcc;
 	std::string _kdm_email;
-	boost::shared_ptr<const dcp::CertificateChain> _signer;
+	boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
 	dcp::Certificate _decryption_certificate;
 	std::string _decryption_private_key;
 	/** true to check for updates on startup */
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 548c51796..4de7a12a5 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1063,7 +1063,7 @@ Film::make_kdm (
 	) const
 {
 	shared_ptr<const dcp::CPL> cpl (new dcp::CPL (cpl_file));
-	shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer();
+	shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
 	if (!signer->valid ()) {
 		throw InvalidSignerError ();
 	}
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7b2cfa3d2..e6043951c 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -143,7 +143,7 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 	}
 
 	/* Check that the signer is OK if we need one */
-	if (_film->is_signed() && !Config::instance()->signer()->valid ()) {
+	if (_film->is_signed() && !Config::instance()->signer_chain()->valid ()) {
 		throw InvalidSignerError ();
 	}
 
@@ -599,7 +599,7 @@ Writer::finish ()
 
 	shared_ptr<const dcp::CertificateChain> signer;
 	if (_film->is_signed ()) {
-		signer = Config::instance()->signer ();
+		signer = Config::instance()->signer_chain ();
 		/* We did check earlier, but check again here to be on the safe side */
 		if (!signer->valid ()) {
 			throw InvalidSignerError ();