-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 | |||
@@ -165,13 +165,9 @@ struct block512_t { | |||
165 | #pragma pack() | 165 | #pragma pack() |
166 | 166 | ||
167 | binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { | 167 | binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { |
168 | binary_t key; key.from_hex(ukey); | 168 | md5_digester rv; |
169 | std::vector<uint16_t> blksums; blksums.reserve(size/sizeof(block512_t)); | 169 | std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), |
170 | block512_t *db = (block512_t*)ptr, | 170 | rv.updater<uint16_t>(), block512_t::tcpcksum ); |
171 | *de = db + size/sizeof(block512_t); | 171 | rv.update( binary_t(ukey) ); |
172 | std::transform( db, de, std::back_inserter(blksums), block512_t::tcpcksum ); | 172 | return rv.final(); |
173 | binary_t subject; | ||
174 | subject.from_data((void*)&(blksums.front()),blksums.size()*sizeof(uint16_t)); | ||
175 | std::copy( key.begin(), key.end(), std::back_inserter(subject) ); | ||
176 | return subject.md5(); | ||
177 | } | 173 | } |