-rw-r--r-- | src/eyetil.cc | 9 | ||||
-rw-r--r-- | src/eyetil.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc index 5bceec7..5489d7b 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc @@ -174,30 +174,21 @@ bool tarchive_t::read_next_header() { } 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; } - -binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { - md5_digester rv; - std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), - rv.updater<uint16_t>(), block512_t::tcpcksum ); - rv.update( binary_t(ukey) ); - return rv.final(); -} - mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) { f.open((fn=d.get_file("the-tarfile.tar")).c_str(),std::ios_base::in|std::ios_base::out|std::ios_base::trunc|std::ios_base::binary); } mimewrite_tarfile::~mimewrite_tarfile() { unlink(fn.c_str()); } int mimewrite_tarfile::write(const char *buf,size_t len) { return f.write(buf,len) ? (idigest.update(buf,len),SOAP_OK) : SOAP_ERR; } diff --git a/src/eyetil.h b/src/eyetil.h index 8af18a4..22e07f1 100644 --- a/src/eyetil.h +++ b/src/eyetil.h @@ -123,16 +123,14 @@ struct mimewrite_string : public mimewrite_base { int write(const char *buf,size_t len) { str.append(buf,len); return SOAP_OK; }; void close() { } }; struct mimewrite_tarfile : public mimewrite_base { std::string fn; std::fstream f; integrity_digester idigest; mimewrite_tarfile(tmpdir_t& d); ~mimewrite_tarfile(); int write(const char *buf,size_t len); void close() { } }; -binary_t integrity_digest(const void *ptr,size_t size, - const std::string& ukey); #endif /* __EYETIL_H */ |