Add Colour::to_rgb_string.

[libdcp.git] / src / decrypted_kdm.h

diff --git a/src/decrypted_kdm.h b/src/decrypted_kdm.h
index f7d21dbe412de2e0558eb77378c7617650206f03..356b98839935a1446552107c8714790256972027 100644 (file)
--- a/src/decrypted_kdm.h
+++ b/src/decrypted_kdm.h
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    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 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/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #ifndef LIBDCP_DECRYPTED_KDM_H
@@ -30,6 +44,9 @@
 #include "types.h"
 #include "certificate.h"
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
+
+class decrypted_kdm_test;
 
 namespace dcp {
 
@@ -110,7 +127,7 @@ public:
                return _keys;
        }
 
-       std::string annotation_text () const {
+       boost::optional<std::string> annotation_text () const {
                return _annotation_text;
        }
 
@@ -123,9 +140,15 @@ public:
        }
 
 private:
+
+       friend class ::decrypted_kdm_test;
+
+       static void put_uuid (uint8_t ** d, std::string id);
+       static std::string get_uuid (unsigned char ** p);
+
        LocalTime _not_valid_before;
        LocalTime _not_valid_after;
-       std::string _annotation_text;
+       boost::optional<std::string> _annotation_text;
        std::string _content_title_text;
        std::string _issue_date;
        std::list<DecryptedKDMKey> _keys;