| -rw-r--r-- | src/eyetil.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc index 57ae607..2e6ab7e 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc @@ -160,18 +160,14 @@ struct block512_t { while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; return ~sum; } }; #pragma pack() binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { - binary_t key; key.from_hex(ukey); - std::vector<uint16_t> blksums; blksums.reserve(size/sizeof(block512_t)); - block512_t *db = (block512_t*)ptr, - *de = db + size/sizeof(block512_t); - std::transform( db, de, std::back_inserter(blksums), block512_t::tcpcksum ); - binary_t subject; - subject.from_data((void*)&(blksums.front()),blksums.size()*sizeof(uint16_t)); - std::copy( key.begin(), key.end(), std::back_inserter(subject) ); - return subject.md5(); + md5_digester rv; + std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), + rv.updater<uint16_t>(), block512_t::tcpcksum ); + rv.update( binary_t(ukey) ); + return rv.final(); } |