X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fkey.cc;h=cf7b4d6d720a25acdfadf275aadbd450f02f4070;hb=3956d410a1fce4fe3b02cd7c52d9717e29371f3b;hp=0e04c27a538b63854f80de8fc64a52f7243a3e4c;hpb=41fc6e366ad3de85704c35961beaf539ab9ceb8b;p=libdcp.git

diff --git a/src/key.cc b/src/key.cc
index 0e04c27a..cf7b4d6d 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -1,32 +1,49 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    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.
 */
 
-#include <sstream>
+/** @file  src/key.cc
+ *  @brief Key class.
+ */
+
+#include "key.h"
+#include <locked_sstream.h>
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+#include <asdcp/KM_util.h>
 #include <string>
 #include <iomanip>
-#include "AS_DCP.h"
-#include "KM_prng.h"
-#include "KM_util.h"
-#include "key.h"
 
 using std::string;
-using std::stringstream;
 using std::setw;
 using std::setfill;
 using namespace dcp;
@@ -68,7 +85,7 @@ Key::operator= (Key const & other)
 	if (this == &other) {
 		return *this;
 	}
-	
+
 	memcpy (_value, other._value, ASDCP::KeyLen);
 	return *this;
 }
@@ -76,8 +93,8 @@ Key::operator= (Key const & other)
 string
 Key::hex () const
 {
-	stringstream g;
-	
+	locked_stringstream g;
+
 	for (unsigned int i = 0; i < ASDCP::KeyLen; ++i) {
 		g << setw(2) << setfill('0') << std::hex << static_cast<int> (_value[i]);
 	}
@@ -96,4 +113,3 @@ dcp::operator!= (Key const & a, Key const & b)
 {
 	return !(a == b);
 }
-