X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fkey.cc;h=9b586ead13eed52a71ce2856fe921fe39f0a5a11;hb=refs%2Fheads%2F1.0-templates;hp=3cf785eca68d41be2a718e541c3a8021057f2986;hpb=a641fdc912a3f0749015decdf9e23ff15186ef78;p=libdcp.git

diff --git a/src/key.cc b/src/key.cc
index 3cf785ec..9b586ead 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -15,6 +15,20 @@
 
     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
@@ -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;
@@ -80,13 +93,17 @@ Key::operator= (Key const & other)
 string
 Key::hex () const
 {
-	stringstream g;
+	DCP_ASSERT (ASDCP::KeyLen == 16);
 
-	for (unsigned int i = 0; i < ASDCP::KeyLen; ++i) {
-		g << setw(2) << setfill('0') << std::hex << static_cast<int> (_value[i]);
-	}
+	char buffer[33];
+	snprintf (
+		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 g.str ();
+	return buffer;
 }
 
 bool
@@ -100,4 +117,3 @@ dcp::operator!= (Key const & a, Key const & b)
 {
 	return !(a == b);
 }
-