From 111044b60ba5f40e003d1ba1d4082794985aa3ad Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 30 Aug 2011 20:04:30 +0000 Subject: introduce incremental md5 digester Signed-off-by: Michael Krelin --- diff --git a/src/eyetil.cc b/src/eyetil.cc index 7669cb6..57ae607 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc @@ -70,6 +70,20 @@ binary_t binary_t::md5() const { return rv; } +void md5_digester::init() { + if(!MD5_Init(&ctx)) throw std::runtime_error("failed to MD5_Init()"); +} +void md5_digester::update(const void *d,size_t l) { + if(!MD5_Update(&ctx,d,l)) throw std::runtime_error("failed to MD5_Update()"); +} +binary_t md5_digester::final() { + binary_t rv(MD5_DIGEST_LENGTH); + if(!MD5_Final((unsigned char*)&(rv.front()), &ctx)) + throw std::runtime_error("failed to MD5_Final()"); + return rv; +} + + static void make_path_for_template(const std::string& p,mode_t m) { struct stat st; std::string pp; diff --git a/src/eyetil.h b/src/eyetil.h index d946e71..eff2c43 100644 --- a/src/eyetil.h +++ b/src/eyetil.h @@ -5,6 +5,7 @@ #include #include #include +#include "openssl/md5.h" class binary_t : public std::vector { public: @@ -21,6 +22,42 @@ class binary_t : public std::vector { binary_t md5() const; }; +struct md5_digester { + MD5_CTX ctx; + md5_digester() { init(); } + + void init(); + void update(const void *d,size_t l); + binary_t final(); + + template + void update(const T& x) { update(&x,sizeof(x)); } + + template + struct update_iterator : public std::iterator { + md5_digester *d; + update_iterator(md5_digester *d_) : d(d_) { } + update_iterator(const update_iterator& x) : d(x.d) { } + + update_iterator& operator*() { return *this; } + update_iterator& operator++() { return *this; } + update_iterator& operator++(int) { return *this; } + + update_iterator& operator=(const T& x) { + d->update(x); return *this; + } + }; + + template + update_iterator updater() { + return update_iterator(this); + } + +}; +template<> inline void md5_digester::update(const binary_t& x) { + update((const unsigned char*)&(x.front()),x.size()); +} + class tmpdir_t { public: std::string dir; -- cgit v0.9.0.2