summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2009-04-05 13:32:09 (UTC)
committer Michael Krelin <hacker@klever.net>2009-04-05 13:32:09 (UTC)
commit878315238f71307b5b62ed314096f4a7c465bf3e (patch) (side-by-side diff)
treedad1579d95b1f7189dc6be5cbd66c36cf340cb94
parent01eedb36de69f92fc896c525047df78b34f87324 (diff)
downloadiii-878315238f71307b5b62ed314096f4a7c465bf3e.zip
iii-878315238f71307b5b62ed314096f4a7c465bf3e.tar.gz
iii-878315238f71307b5b62ed314096f4a7c465bf3e.tar.bz2
integrity digest calculation
implemented integrity digest calculation for uploaded files, thanks to cdavies of eye-fi forums. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/eyetil.cc29
-rw-r--r--src/eyetil.h3
2 files changed, 31 insertions, 1 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc
index 2fbd687..fe816a6 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -1,17 +1,18 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <syslog.h>
#include <iostream>
#include <cassert>
#include <stdexcept>
+#include <algorithm>
+#include <numeric>
#include <openssl/md5.h>
#include "eyetil.h"
binary_t& binary_t::from_hex(const std::string& h) {
- /* TODO: algorithmize */
std::string::size_type hs = h.length();
if(hs&1)
throw std::runtime_error("odd number of characters in hexadecimal number");
int rvs = hs>>1;
resize(rvs);
const unsigned char *hp = (const unsigned char*)h.data();
@@ -114,6 +115,32 @@ std::string tarchive_t::entry_pathname() {
}
bool tarchive_t::read_data_into_fd(int fd) {
assert(a);
return archive_read_data_into_fd(a,fd)==ARCHIVE_OK;
}
+
+#pragma pack(1)
+struct block512_t {
+ enum { words = 512 / sizeof(uint16_t) };
+ uint16_t data[words];
+
+ static uint16_t tcpcksum(block512_t& data) {
+ uint32_t sum = std::accumulate(data.data,data.data+words,0);
+ 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();
+}
diff --git a/src/eyetil.h b/src/eyetil.h
index 195d24f..378f703 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -42,7 +42,10 @@ class tarchive_t {
std::string entry_pathname();
bool read_data_into_fd(int fd);
};
+binary_t integrity_digest(const void *ptr,size_t size,
+ const std::string& ukey);
+
#endif /* __EYETIL_H */