Add parsing of ForensicMarkFlagList in KDMRequiredExtensions constructor.

[libdcp.git] / src / key.cc

diff --git a/src/key.cc b/src/key.cc
index e7f34c04113d91ba34ab0888ccb731285e1048f3..b8ba6d60ddfb7f90311bbc0d7b02925e8d0cd182 100644 (file)
--- a/src/key.cc
+++ b/src/key.cc
@@ -16,6 +16,19 @@
     You should have received a copy of the GNU General Public License
     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.
 */
 
 /** @file  src/key.cc
@@ -23,15 +36,14 @@
  */
 
 #include "key.h"
-#include "AS_DCP.h"
-#include "KM_prng.h"
-#include "KM_util.h"
-#include <sstream>
+#include "dcp_assert.h"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+#include <asdcp/KM_util.h>
 #include <string>
 #include <iomanip>
 
 using std::string;
-using std::stringstream;
 using std::setw;
 using std::setfill;
 using namespace dcp;
@@ -81,13 +93,21 @@ Key::operator= (Key const & other)
 string
 Key::hex () const
 {
-       stringstream g;
-
-       for (unsigned int i = 0; i < ASDCP::KeyLen; ++i) {
-               g << setw(2) << setfill('0') << std::hex << static_cast<int> (_value[i]);
-       }
-
-       return g.str ();
+       DCP_ASSERT (ASDCP::KeyLen == 16);
+
+       char buffer[33];
+#ifdef LIBDCP_WINDOWS
+       __mingw_snprintf (
+#else
+       snprintf (
+#endif
+               buffer, sizeof(buffer),
+               "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx",
+               _value[0], _value[1], _value[2], _value[3], _value[4], _value[5], _value[6], _value[7],
+               _value[8], _value[9], _value[10], _value[11], _value[12], _value[13], _value[14], _value[15]
+               );
+
+       return buffer;
 }
 
 bool
@@ -101,4 +121,3 @@ dcp::operator!= (Key const & a, Key const & b)
 {
        return !(a == b);
 }
-