Make terminate_threads() less likely to leave _threads containing invalid pointers.

[dcpomatic.git] / src / lib / screen.cc

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 96a59236d82a565612c384865fb26da628056efd..5ec00f9c152ed7e04f56fe000f0dcfae4ef2b211 100644 (file)
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -1,25 +1,30 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "screen.h"
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
+
+using std::string;
+using std::vector;
 
 Screen::Screen (cxml::ConstNodePtr node)
        : name (node->string_child("Name"))
@@ -32,7 +37,11 @@ Screen::Screen (cxml::ConstNodePtr node)
        }
 
        BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children ("TrustedDevice")) {
-               trusted_devices.push_back (dcp::Certificate (i->content ()));
+               if (boost::algorithm::starts_with(i->content(), "-----BEGIN CERTIFICATE-----")) {
+                       trusted_devices.push_back (TrustedDevice(dcp::Certificate(i->content())));
+               } else {
+                       trusted_devices.push_back (TrustedDevice(i->content()));
+               }
        }
 }
 
@@ -46,7 +55,49 @@ Screen::as_xml (xmlpp::Element* parent) const
 
        parent->add_child("Notes")->add_child_text (notes);
 
-       BOOST_FOREACH (dcp::Certificate const & i, trusted_devices) {
-               parent->add_child("TrustedDevice")->add_child_text (i.certificate (true));
+       BOOST_FOREACH (TrustedDevice i, trusted_devices) {
+               parent->add_child("TrustedDevice")->add_child_text(i.as_string());
+       }
+}
+
+vector<string>
+Screen::trusted_device_thumbprints () const
+{
+       vector<string> t;
+       BOOST_FOREACH (TrustedDevice i, trusted_devices) {
+               t.push_back (i.thumbprint());
+       }
+       return t;
+}
+
+TrustedDevice::TrustedDevice (string thumbprint)
+       : _thumbprint (thumbprint)
+{
+
+}
+
+TrustedDevice::TrustedDevice (dcp::Certificate certificate)
+       : _certificate (certificate)
+{
+
+}
+
+string
+TrustedDevice::as_string () const
+{
+       if (_certificate) {
+               return _certificate->certificate(true);
+       }
+
+       return *_thumbprint;
+}
+
+string
+TrustedDevice::thumbprint () const
+{
+       if (_certificate) {
+               return _certificate->thumbprint ();
        }
+
+       return *_thumbprint;
 }