X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fkey.cc;h=b8ba6d60ddfb7f90311bbc0d7b02925e8d0cd182;hb=8c852cbececaa94e7efbb0e8508484e073b06c67;hp=43e59dfc6de756a078731c5cf87687d8bcb614ea;hpb=ac265d3d008328b9bdaf00c39ebcd86f263605c7;p=libdcp.git

diff --git a/src/key.cc b/src/key.cc
index 43e59dfc..b8ba6d60 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2013-2014 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.
 */
 
 /** @file  src/key.cc
@@ -22,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;
@@ -72,7 +85,7 @@ Key::operator= (Key const & other)
 	if (this == &other) {
 		return *this;
 	}
-	
+
 	memcpy (_value, other._value, ASDCP::KeyLen);
 	return *this;
 }
@@ -80,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
@@ -100,4 +121,3 @@ dcp::operator!= (Key const & a, Key const & b)
 {
 	return !(a == b);
 }
-