summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyetil.cc14
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
@@ -144,34 +144,30 @@ std::string tarchive_t::entry_pathname() {
144 assert(a); assert(e); 144 assert(a); assert(e);
145 return archive_entry_pathname(e); 145 return archive_entry_pathname(e);
146} 146}
147 147
148bool tarchive_t::read_data_into_fd(int fd) { 148bool tarchive_t::read_data_into_fd(int fd) {
149 assert(a); 149 assert(a);
150 return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; 150 return archive_read_data_into_fd(a,fd)==ARCHIVE_OK;
151} 151}
152 152
153#pragma pack(1) 153#pragma pack(1)
154struct block512_t { 154struct block512_t {
155 enum { words = 512 / sizeof(uint16_t) }; 155 enum { words = 512 / sizeof(uint16_t) };
156 uint16_t data[words]; 156 uint16_t data[words];
157 157
158 static uint16_t tcpcksum(block512_t& data) { 158 static uint16_t tcpcksum(block512_t& data) {
159 uint32_t sum = std::accumulate(data.data,data.data+words,0); 159 uint32_t sum = std::accumulate(data.data,data.data+words,0);
160 while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; 160 while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw;
161 return ~sum; 161 return ~sum;
162 } 162 }
163 163
164}; 164};
165#pragma pack() 165#pragma pack()
166 166
167binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { 167binary_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}