summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/eyetil.cc14
-rw-r--r--src/eyetil.h37
2 files changed, 51 insertions, 0 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc
index 7669cb6..57ae607 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -1,163 +1,177 @@
#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"
#include "config.h"
#ifdef HAVE_LIBUUID
# include <uuid/uuid.h>
#endif
binary_t& binary_t::from_hex(const std::string& h) {
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();
iterator oi=begin();
char t[3] = { 0,0,0 };
for(int i=0;i<rvs;++i) {
t[0]=*(hp++); t[1]=*(hp++);
*(oi++) = strtol(t,0,16);
}
return *this;
}
binary_t& binary_t::from_data(const void *d,size_t s) {
resize(s);
std::copy((const unsigned char*)d,(const unsigned char *)d+s,
begin() );
return *this;
}
binary_t& binary_t::make_nonce() {
#ifdef HAVE_LIBUUID
uuid_t uuid;
uuid_generate(uuid);
from_data((unsigned char*)uuid,sizeof(uuid));
#else
resize(16);
std::generate_n(begin(),16,rand);
#endif /* HAVE_LIBUUID */
return *this;
}
std::string binary_t::hex() const {
std::string rv;
rv.reserve((size()<<1)+1);
char t[3] = {0,0,0};
for(const_iterator i=begin(),ie=end();i!=ie;++i) {
int rc = snprintf(t,sizeof(t),"%02x",*i);
assert(rc<sizeof(t));
rv += t;
}
return rv;
}
binary_t binary_t::md5() const {
binary_t rv(MD5_DIGEST_LENGTH);
if(!MD5(
(const unsigned char*)&(front()),size(),
(unsigned char*)&(rv.front()) ))
throw std::runtime_error("failed to md5()");
return rv;
}
+void md5_digester::init() {
+ if(!MD5_Init(&ctx)) throw std::runtime_error("failed to MD5_Init()");
+}
+void md5_digester::update(const void *d,size_t l) {
+ if(!MD5_Update(&ctx,d,l)) throw std::runtime_error("failed to MD5_Update()");
+}
+binary_t md5_digester::final() {
+ binary_t rv(MD5_DIGEST_LENGTH);
+ if(!MD5_Final((unsigned char*)&(rv.front()), &ctx))
+ throw std::runtime_error("failed to MD5_Final()");
+ return rv;
+}
+
+
static void make_path_for_template(const std::string& p,mode_t m) {
struct stat st;
std::string pp;
for(std::string::size_type sl=p.find('/',1);
sl!=std::string::npos;
sl=p.find('/',sl+1)) {
if(stat( (pp=p.substr(0,sl)).c_str() ,&st)
|| !S_ISDIR(st.st_mode)) {
if(mkdir(pp.c_str(),m))
throw std::runtime_error("failed to mkdir()");
}
}
}
tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) {
make_path_for_template(dt,0777);
if(!mkdtemp((char*)dir.data()))
throw std::runtime_error("failed to mkdtmp()");
}
tmpdir_t::~tmpdir_t() {
assert(!dir.empty());
if(rmdir(dir.c_str())) {
syslog(LOG_WARNING,"Failed to remove '%s' directory",dir.c_str());
}
}
std::string tmpdir_t::get_file(const std::string& f) {
std::string::size_type ls = f.rfind('/');
return dir+'/'+(
(ls==std::string::npos)
? f
: f.substr(ls+1)
);
}
tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) {
if(!a) throw std::runtime_error("failed to archive_read_new()");
if(archive_read_support_format_tar(a)) {
archive_read_finish(a);
throw std::runtime_error("failed to archive_read_support_format_tar()");
}
if(archive_read_open_memory(a,p,s)) {
archive_read_finish(a);
throw std::runtime_error("failed to archive_read_open_memory()");
}
}
tarchive_t::~tarchive_t() {
assert(a);
archive_read_finish(a);
}
bool tarchive_t::read_next_header() {
assert(a);
return archive_read_next_header(a,&e)==ARCHIVE_OK;
}
std::string tarchive_t::entry_pathname() {
assert(a); assert(e);
return archive_entry_pathname(e);
}
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 d946e71..eff2c43 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -1,52 +1,89 @@
#ifndef __EYETIL_H
#define __EYETIL_H
#include <vector>
#include <string>
#include <archive.h>
#include <archive_entry.h>
+#include "openssl/md5.h"
class binary_t : public std::vector<unsigned char> {
public:
binary_t() { }
binary_t(size_type n) : std::vector<unsigned char>(n) { }
binary_t(const std::string& h) { from_hex(h); }
binary_t(const void *d,size_t s) { from_data(d,s); }
binary_t& from_hex(const std::string& h);
binary_t& from_data(const void *d,size_t s);
binary_t& make_nonce();
std::string hex() const;
binary_t md5() const;
};
+struct md5_digester {
+ MD5_CTX ctx;
+ md5_digester() { init(); }
+
+ void init();
+ void update(const void *d,size_t l);
+ binary_t final();
+
+ template<typename T>
+ void update(const T& x) { update(&x,sizeof(x)); }
+
+ template<typename T>
+ struct update_iterator : public std::iterator<std::output_iterator_tag,T,void,T*,T&> {
+ md5_digester *d;
+ update_iterator(md5_digester *d_) : d(d_) { }
+ update_iterator(const update_iterator& x) : d(x.d) { }
+
+ update_iterator& operator*() { return *this; }
+ update_iterator& operator++() { return *this; }
+ update_iterator& operator++(int) { return *this; }
+
+ update_iterator& operator=(const T& x) {
+ d->update(x); return *this;
+ }
+ };
+
+ template<typename T>
+ update_iterator<T> updater() {
+ return update_iterator<T>(this);
+ }
+
+};
+template<> inline void md5_digester::update<binary_t>(const binary_t& x) {
+ update((const unsigned char*)&(x.front()),x.size());
+}
+
class tmpdir_t {
public:
std::string dir;
tmpdir_t(const std::string& dt);
~tmpdir_t();
std::string get_file(const std::string& f);
};
class tarchive_t {
public:
struct archive *a;
struct archive_entry *e;
tarchive_t(void *p,size_t s);
~tarchive_t();
bool read_next_header();
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 */