-rw-r--r-- | src/eyetil.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc index 11e2fb7..cd22eea 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc | |||
@@ -78,16 +78,21 @@ void md5_digester::update(const void *d,size_t l) { | |||
78 | } | 78 | } |
79 | binary_t md5_digester::final() { | 79 | binary_t md5_digester::final() { |
80 | binary_t rv(MD5_DIGEST_LENGTH); | 80 | binary_t rv(MD5_DIGEST_LENGTH); |
81 | if(!MD5_Final((unsigned char*)&(rv.front()), &ctx)) | 81 | if(!MD5_Final((unsigned char*)&(rv.front()), &ctx)) |
82 | throw std::runtime_error("failed to MD5_Final()"); | 82 | throw std::runtime_error("failed to MD5_Final()"); |
83 | return rv; | 83 | return rv; |
84 | } | 84 | } |
85 | 85 | ||
86 | uint16_t block512_t::tcpcksum(block512_t& data) { | ||
87 | uint32_t sum = std::accumulate(data.data,data.data+words,0); | ||
88 | while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; | ||
89 | return 0xffff&~sum; | ||
90 | } | ||
86 | 91 | ||
87 | static void make_path_for_template(const std::string& p,mode_t m) { | 92 | static void make_path_for_template(const std::string& p,mode_t m) { |
88 | struct stat st; | 93 | struct stat st; |
89 | std::string pp; | 94 | std::string pp; |
90 | for(std::string::size_type sl=p.find('/',1); | 95 | for(std::string::size_type sl=p.find('/',1); |
91 | sl!=std::string::npos; | 96 | sl!=std::string::npos; |
92 | sl=p.find('/',sl+1)) { | 97 | sl=p.find('/',sl+1)) { |
93 | if(stat( (pp=p.substr(0,sl)).c_str() ,&st) | 98 | if(stat( (pp=p.substr(0,sl)).c_str() ,&st) |
@@ -145,29 +150,16 @@ std::string tarchive_t::entry_pathname() { | |||
145 | return archive_entry_pathname(e); | 150 | return archive_entry_pathname(e); |
146 | } | 151 | } |
147 | 152 | ||
148 | bool tarchive_t::read_data_into_fd(int fd) { | 153 | bool tarchive_t::read_data_into_fd(int fd) { |
149 | assert(a); | 154 | assert(a); |
150 | return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; | 155 | return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; |
151 | } | 156 | } |
152 | 157 | ||
153 | #pragma pack(1) | ||
154 | struct block512_t { | ||
155 | enum { words = 512 / sizeof(uint16_t) }; | ||
156 | uint16_t data[words]; | ||
157 | |||
158 | static uint16_t tcpcksum(block512_t& data) { | ||
159 | uint32_t sum = std::accumulate(data.data,data.data+words,0); | ||
160 | while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; | ||
161 | return 0xffff&~sum; | ||
162 | } | ||
163 | |||
164 | }; | ||
165 | #pragma pack() | ||
166 | 158 | ||
167 | binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { | 159 | binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { |
168 | md5_digester rv; | 160 | md5_digester rv; |
169 | std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), | 161 | std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), |
170 | rv.updater<uint16_t>(), block512_t::tcpcksum ); | 162 | rv.updater<uint16_t>(), block512_t::tcpcksum ); |
171 | rv.update( binary_t(ukey) ); | 163 | rv.update( binary_t(ukey) ); |
172 | return rv.final(); | 164 | return rv.final(); |
173 | } | 165 | } |