Allow KDMRecipient and hence Screen to convert certs to dcp::Certificate lazily.

This is pretty slow (as it runs the certificate through OpenSSL) and we
don't need to do it for every certificate in a database when we load the
database.

2 files changed, 8 insertions, 8 deletions

diff --git a/test/cinema_list_test.cc b/test/cinema_list_test.cc
index c19b88315..58af7839a 100644
--- a/test/cinema_list_test.cc
+++ b/test/cinema_list_test.cc
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(add_screen_test)
 	BOOST_CHECK(check[0].first == screen_id);
 	BOOST_CHECK_EQUAL(check[0].second.name, "Screen 1");
 	BOOST_CHECK_EQUAL(check[0].second.notes, "Smells of popcorn");
-	BOOST_CHECK(check[0].second.recipient == dcp::Certificate(dcp::file_to_string("test/data/cert.pem")));
+	BOOST_CHECK(check[0].second.recipient() == dcp::Certificate(dcp::file_to_string("test/data/cert.pem")));
 	BOOST_CHECK(check[0].second.recipient_file == string("test/data/cert.pem"));
 }
 
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(update_screen_test)
 	BOOST_CHECK(check[0].first == screen_id);
 	BOOST_CHECK_EQUAL(check[0].second.name, "Screen 1 updated");
 	BOOST_CHECK_EQUAL(check[0].second.notes, "Smells of popcorn and hope");
-	BOOST_CHECK(check[0].second.recipient == dcp::Certificate(dcp::file_to_string("test/data/cert.pem")));
+	BOOST_CHECK(check[0].second.recipient() == dcp::Certificate(dcp::file_to_string("test/data/cert.pem")));
 	BOOST_CHECK(check[0].second.recipient_file == string("test/data/cert.pem"));
 }
 
@@ -247,11 +247,11 @@ BOOST_AUTO_TEST_CASE(cinemas_list_copy_from_xml_test)
 	BOOST_CHECK_EQUAL(screens.size(), 2U);
 	auto screen_iter = screens.begin();
 	BOOST_CHECK_EQUAL(screen_iter->second.name, "1");
-	BOOST_CHECK(screen_iter->second.recipient);
-	BOOST_CHECK_EQUAL(screen_iter->second.recipient->subject_dn_qualifier(), "CVsuuv9eYsQZSl8U4fDpvOmzZhI=");
+	BOOST_CHECK(screen_iter->second.recipient());
+	BOOST_CHECK_EQUAL(screen_iter->second.recipient()->subject_dn_qualifier(), "CVsuuv9eYsQZSl8U4fDpvOmzZhI=");
 	++screen_iter;
 	BOOST_CHECK_EQUAL(screen_iter->second.name, "2");
-	BOOST_CHECK(screen_iter->second.recipient);
-	BOOST_CHECK_EQUAL(screen_iter->second.recipient->subject_dn_qualifier(), "CVsuuv9eYsQZSl8U4fDpvOmzZhI=");
+	BOOST_CHECK(screen_iter->second.recipient());
+	BOOST_CHECK_EQUAL(screen_iter->second.recipient()->subject_dn_qualifier(), "CVsuuv9eYsQZSl8U4fDpvOmzZhI=");
 }
 
diff --git a/test/dkdm_recipient_list_test.cc b/test/dkdm_recipient_list_test.cc
index 406d181a1..9d4486595 100644
--- a/test/dkdm_recipient_list_test.cc
+++ b/test/dkdm_recipient_list_test.cc
@@ -45,12 +45,12 @@ BOOST_AUTO_TEST_CASE(dkdm_receipient_list_copy_from_xml_test)
 	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.emails.size(), 2U);
 	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.emails[0], "epicbob@gmail.com");
 	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.emails[1], "boblikesemlong@cinema-bob.com");
-	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.recipient->subject_dn_qualifier(), "r5/Q5f3UTm7qzoF5QzNZP6aEuvI=");
+	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.recipient()->subject_dn_qualifier(), "r5/Q5f3UTm7qzoF5QzNZP6aEuvI=");
 	++dkdm_recipient_iter;
 
 	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.name, "Sharon's Shorts");
 	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.notes, "Even if it sucks, at least it's over quickly");
-	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.recipient->subject_dn_qualifier(), "FHerM3Us/DWuqD1MnztStSlFJO0=");
+	BOOST_CHECK_EQUAL(dkdm_recipient_iter->second.recipient()->subject_dn_qualifier(), "FHerM3Us/DWuqD1MnztStSlFJO0=");
 	++dkdm_recipient_iter;
 }