diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-13 12:23:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-13 12:23:37 +0100 |
| commit | 283205f4bff717d0f70b5a4464df4ebd3581a51b (patch) | |
| tree | 5dec6c2d09dda8c5202e1428a6d82a83781936ac /src/lib | |
| parent | a306df9145d16046e51e8b7ff5222e341e98fdbd (diff) | |
Use nettle rather then openssl for MD5 digesting.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/digester.cc | 16 | ||||
| -rw-r--r-- | src/lib/digester.h | 4 | ||||
| -rw-r--r-- | src/lib/wscript | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/digester.cc b/src/lib/digester.cc index 2d25d41d1..66e617de8 100644 --- a/src/lib/digester.cc +++ b/src/lib/digester.cc @@ -18,10 +18,10 @@ */ -#include <iomanip> -#include <openssl/md5.h> #include "digester.h" #include "safe_stringstream.h" +#include <nettle/md5.h> +#include <iomanip> using std::string; using std::hex; @@ -30,7 +30,7 @@ using std::setw; Digester::Digester () { - MD5_Init (&_context); + md5_init (&_context); } Digester::~Digester () @@ -41,24 +41,24 @@ Digester::~Digester () void Digester::add (void const * data, size_t size) { - MD5_Update (&_context, data, size); + md5_update (&_context, size, reinterpret_cast<uint8_t const *> (data)); } void Digester::add (string const & s) { - add (s.c_str (), s.length ()); + add (s.c_str(), s.length()); } string Digester::get () const { if (!_digest) { - unsigned char digest[MD5_DIGEST_LENGTH]; - MD5_Final (digest, &_context); + unsigned char digest[MD5_DIGEST_SIZE]; + md5_digest (&_context, MD5_DIGEST_SIZE, digest); SafeStringStream s; - for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) { + for (int i = 0; i < MD5_DIGEST_SIZE; ++i) { s << hex << setfill('0') << setw(2) << ((int) digest[i]); } diff --git a/src/lib/digester.h b/src/lib/digester.h index 92eb5faa3..bec1f6416 100644 --- a/src/lib/digester.h +++ b/src/lib/digester.h @@ -18,7 +18,7 @@ */ -#include <openssl/md5.h> +#include <nettle/md5.h> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <string> @@ -41,6 +41,6 @@ public: std::string get () const; private: - mutable MD5_CTX _context; + mutable md5_ctx _context; mutable boost::optional<std::string> _digest; }; diff --git a/src/lib/wscript b/src/lib/wscript index fcbccf2b7..22d8c4477 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -157,7 +157,7 @@ def build(bld): AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ - CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU + CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE """ if bld.env.TARGET_OSX: |