projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Film::clear_markers().
[dcpomatic.git]
/
src
/
lib
/
digester.cc
diff --git
a/src/lib/digester.cc
b/src/lib/digester.cc
index 66e617de81d371c0d8eaf0196569920d5aac45fe..452452ba4b1c1091622a001c639446d83f2f2989 100644
(file)
--- a/
src/lib/digester.cc
+++ b/
src/lib/digester.cc
@@
-19,9
+19,10
@@
*/
#include "digester.h"
*/
#include "digester.h"
-#include "
safe_stringstream
.h"
+#include "
dcpomatic_assert
.h"
#include <nettle/md5.h>
#include <iomanip>
#include <nettle/md5.h>
#include <iomanip>
+#include <cstdio>
using std::string;
using std::hex;
using std::string;
using std::hex;
@@
-57,13
+58,26
@@
Digester::get () const
unsigned char digest[MD5_DIGEST_SIZE];
md5_digest (&_context, MD5_DIGEST_SIZE, digest);
unsigned char digest[MD5_DIGEST_SIZE];
md5_digest (&_context, MD5_DIGEST_SIZE, digest);
-
SafeStringStream s
;
+
char hex[MD5_DIGEST_SIZE * 2 + 1]
;
for (int i = 0; i < MD5_DIGEST_SIZE; ++i) {
for (int i = 0; i < MD5_DIGEST_SIZE; ++i) {
- s
<< hex << setfill('0') << setw(2) << ((int)
digest[i]);
+ s
printf(hex + i * 2, "%02x",
digest[i]);
}
}
- _digest =
s.str ()
;
+ _digest =
hex
;
}
return _digest.get ();
}
}
return _digest.get ();
}
+
+void
+Digester::get (uint8_t* buffer) const
+{
+ md5_digest (&_context, MD5_DIGEST_SIZE, buffer);
+}
+
+
+int
+Digester::size () const
+{
+ return MD5_DIGEST_SIZE;
+}