Changeset 4671:21813f03d0cc in roaraudio

Timestamp:

12/20/10 00:23:21 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added RFC 2440/4880 CRC24 binding for hashing functions

Files:

• include/libroar/crc.h (modified) (1 diff)
• libroar/crc.c (modified) (1 diff)
• libroar/hash.c (modified) (4 diffs)

include/libroar/crc.h

@@ -42 +42 @@
 #define roar_crc24_init() roar_crc24_add(0, NULL, 0)
 
+int roar_hash_crc24_init(void * state);
+int roar_hash_crc24_digest(void * state, void * digest, size_t * len);
+int roar_hash_crc24_proc(void * state, const void * data, size_t len);
+
 #endif
 

libroar/crc.c

@@ -58 +58 @@
 }
 
+int roar_hash_crc24_init(void * state) {
+ uint32_t * self = state;
+
+ *self = roar_crc24_init();
+
+ return 0;
+}
+
+int roar_hash_crc24_digest(void * state, void * digest, size_t * len) {
+ uint32_t * self = state;
+ unsigned char * out  = digest;
+ register uint32_t crc;
+
+ if ( *len < 3 )
+  return -1;
+
+ *len = 3;
+
+ crc = *self;
+
+ out[0] = ((crc & 0x00FF0000) >> 16) & 0xFF;
+ out[1] = ((crc & 0x0000FF00) >>  8) & 0xFF;
+ out[2] = ((crc & 0x000000FF) >>  0) & 0xFF;
+
+ return 0;
+}
+
+int roar_hash_crc24_proc(void * state, const void * data, size_t len) {
+ uint32_t * self = state;
+
+ *self = roar_crc24_add(*self, data, len);
+
+ return 0;
+}
+
 //ll

libroar/hash.c

@@ -98 +98 @@
   (int (*)(void *, const void *, size_t))roar_hash_tiger_proc
  },
+ {ROAR_HT_RFC2440, sizeof(uint32_t), -1,
+  roar_hash_crc24_init, NULL,
+  roar_hash_crc24_digest, NULL, roar_hash_crc24_proc
+ },
  {-1, -1, -1, NULL, NULL, NULL, NULL, NULL}
 };
@@ -290 +294 @@
  struct roar_hash_state * state;
  size_t len;
- int ret;
+ int ret = 0;
+
+ ROAR_DBG("roar_hash_salted_buffer(digest=%p, data=%p, datalen=%llu, algo=%i, salt=%p, saltlen=%llu) = ?", digest, data, (unsigned long long int)datalen, algo, salt, (unsigned long long int)saltlen);
 
  if ( digest == NULL || data == NULL )
@@ -300 +306 @@
 
  if ( (state = roar_hash_new(algo)) != NULL ) {
+  ROAR_DBG("roar_hash_salted_buffer(*): ret=%i", ret);
+
   if ( roar_hash_proc(state, data, datalen) == -1 )
    ret = -1;
+
+  ROAR_DBG("roar_hash_salted_buffer(*): ret=%i", ret);
 
   if ( saltlen != 0 )
@@ -307 +317 @@
     ret = -1;
 
+  ROAR_DBG("roar_hash_salted_buffer(*): ret=%i", ret);
+
   if ( roar_hash_digest(state, digest, &len) == -1 )
    ret = -1;
 
+  ROAR_DBG("roar_hash_salted_buffer(*): ret=%i", ret);
+
   if ( roar_hash_free(state) == -1 )
    ret = -1;
 
+  ROAR_DBG("roar_hash_salted_buffer(*): ret=%i", ret);
+
   return ret;
  }
+
+ ROAR_DBG("roar_hash_salted_buffer(*): state=%p", state);
 
 #ifdef ROAR_HAVE_LIBGCRYPT