X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmd5_digester.cc;h=e265d18eb1bb9d76e2672db2003c3af72552b90e;hb=4c4aeeda4f1cec028072f9995572f8a67dca974f;hp=1244209bd62fc149aea62d4f1f41025ce400d916;hpb=c5b3d91fab31fde4c21e1cc5bb5adb1d6d26fcca;p=dcpomatic.git

diff --git a/src/lib/md5_digester.cc b/src/lib/md5_digester.cc
index 1244209bd..e265d18eb 100644
--- a/src/lib/md5_digester.cc
+++ b/src/lib/md5_digester.cc
@@ -1,29 +1,29 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include <iomanip>
-#include <sstream>
 #include <openssl/md5.h>
 #include "md5_digester.h"
+#include "safe_stringstream.h"
 
 using std::string;
-using std::stringstream;
 using std::hex;
 using std::setfill;
 using std::setw;
@@ -44,20 +44,26 @@ MD5Digester::add (void const * data, size_t size)
 	MD5_Update (&_context, data, size);
 }
 
+void
+MD5Digester::add (string const & s)
+{
+	add (s.c_str (), s.length ());
+}
+
 string
 MD5Digester::get () const
 {
 	if (!_digest) {
 		unsigned char digest[MD5_DIGEST_LENGTH];
 		MD5_Final (digest, &_context);
-		
-		stringstream s;
+
+		SafeStringStream s;
 		for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) {
 			s << hex << setfill('0') << setw(2) << ((int) digest[i]);
 		}
-		
+
 		_digest = s.str ();
 	}
-	
+
 	return _digest.get ();
 }