Changeset 4459:552ec493bac9 in roaraudio

Timestamp:

10/10/10 06:26:23 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make it work, implemented unaligned writes

File:

• libroar/hash_tiger.c (modified) (4 diffs)

libroar/hash_tiger.c

@@ -622 +622 @@
   return 0;
 
- len = state->blocks * BLOCK_LEN + state->inlen;
+ len  = state->blocks * BLOCK_LEN + state->inlen;
+ len *= 8; // byte -> bit
 
  if ( state->inlen < 56 ) { /* enough room */
@@ -714 +715 @@
  uint64_t a, b, c, aa, bb, cc;
  uint64_t x[8];
+
+ ROAR_DBG("roar_hash_tiger_proc_block(state=%p, block=%p) = ?", state, block);
 
  if ( state == NULL || block == NULL )
@@ -757 +760 @@
  state->c = c + cc;
 
+ state->blocks++;
+
+ ROAR_DBG("roar_hash_tiger_proc_block(state=%p, block=%p) = 0", state, block);
  return 0;
 }
@@ -764 +770 @@
 }
 
-int roar_hash_tiger_proc(struct roar_hash_tiger * state, void * data, size_t len);
+int roar_hash_tiger_proc(struct roar_hash_tiger * state, void * data, size_t len) {
+ size_t needlen;
+
+ ROAR_DBG("roar_hash_tiger_proc(state=%p, data=%p, len=%llu) = ?", state, data, (long long unsigned int)len);
+
+ if ( state == NULL )
+  return -1;
+
+ if ( len == 0 )
+  return 0;
+
+ if ( data == NULL )
+  return -1;
+
+ if ( state->inlen ) {
+  needlen = BLOCK_LEN - state->inlen;
+  ROAR_DBG("roar_hash_tiger_proc(state=%p, ...): adding %llu byte to inbuf block", state, (long long unsigned int)needlen);
+
+  if ( len < needlen ) {
+   ROAR_DBG("roar_hash_tiger_proc(state=%p, ...): inbufblock is short", state);
+   memcpy(state->inbuf + state->inlen, data, len);
+   state->inlen += len;
+   ROAR_DBG("roar_hash_tiger_proc(state=%p, ...) = 0", state);
+   return 0;
+  }
+
+  memcpy(state->inbuf + state->inlen, data, needlen);
+  len  -= needlen;
+  data += needlen;
+
+  state->inlen = 0;
+
+  if ( roar_hash_tiger_proc_block(state, state->inbuf) == -1 )
+   return -1;
+ }
+
+ for (; len >= BLOCK_LEN; ) {
+  ROAR_DBG("roar_hash_tiger_proc(state=%p, ...): running normal block...", state);
+
+  if ( roar_hash_tiger_proc_block(state, data) == -1 )
+   return -1;
+
+  len  -= BLOCK_LEN;
+  data += BLOCK_LEN;
+ }
+
+ if ( len ) {
+  ROAR_DBG("roar_hash_tiger_proc(state=%p, ...): adding %llu byte to new inbuf", state, (long long unsigned int)len);
+  memcpy(state->inbuf, data, len);
+  state->inlen = len;
+ }
+
+ ROAR_DBG("roar_hash_tiger_proc(state=%p, ...) = 0", state);
+ return 0;
+}
 
 //ll