Changeset 5284:3fcf039ca02c in roaraudio for libroar

Timestamp:

11/22/11 12:53:18 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ported hash API to < 32 bit archs

File:

• libroar/hash.c (modified) (12 diffs)

libroar/hash.c

@@ -46 +46 @@
 
 static const struct hashes {
- const uint_least32_t id;
+ const roar_hash_t    id;
  const char         * name;
  const ssize_t        dlen;
@@ -110 +110 @@
 };
 
-static struct roar_hash_cmds * roar_ht2cmds(const int ht) {
+static struct roar_hash_cmds * roar_ht2cmds(const roar_hash_t ht) {
  size_t i;
 
- for(i = 0; _libroar_hash_cmds[i].algo != -1; i++)
+ for(i = 0; _libroar_hash_cmds[i].algo != (roar_hash_t)-1; i++)
   if ( _libroar_hash_cmds[i].algo == ht )
    return &(_libroar_hash_cmds[i]);
@@ -121 +121 @@
 }
 
-static inline int roar_ht2gcrypt_tested (const int ht) {
+static inline int roar_ht2gcrypt_tested (const roar_hash_t ht) {
 #ifdef ROAR_HAVE_LIBGCRYPT
  const char * name;
@@ -143 +143 @@
 }
 
-const char * roar_ht2str (const int    ht) {
+const char * roar_ht2str (const roar_hash_t  ht) {
  int i;
 
- for (i = 0; _libroar_hashes[i].id != (uint_least32_t)-1; i++)
+ for (i = 0; _libroar_hashes[i].id != (roar_hash_t)-1; i++)
   if ( _libroar_hashes[i].id == ht )
    return _libroar_hashes[i].name;
@@ -154 +154 @@
 }
 
-int          roar_str2ht (const char * ht) {
+roar_hash_t      roar_str2ht (const char * ht) {
  int i;
 
- for (i = 0; _libroar_hashes[i].id != (uint_least32_t)-1; i++)
+ for (i = 0; _libroar_hashes[i].id != (roar_hash_t)-1; i++)
   if ( !strcasecmp(_libroar_hashes[i].name, ht) )
    return _libroar_hashes[i].id;
@@ -165 +165 @@
 }
 
-ssize_t      roar_ht_digestlen (const int    ht) {
+ssize_t      roar_ht_digestlen (const roar_hash_t   ht) {
  int i;
 
@@ -192 +192 @@
 }
 
-ssize_t      roar_hash_digest2str(char * out, size_t outlen, void * digest, size_t digestlen, int ht) {
+ssize_t      roar_hash_digest2str(char * out, size_t outlen, void * digest, size_t digestlen, roar_hash_t ht) {
  ssize_t slen = roar_ht_digestlen(ht);
  union {
@@ -300 +300 @@
 }
 
-int          roar_ht_is_supported(const int    ht) {
+int          roar_ht_is_supported(const roar_hash_t ht) {
  roar_crypto_init();
 
@@ -316 +316 @@
 }
 
-struct roar_hash_state * roar_hash_new(int algo) {
+struct roar_hash_state * roar_hash_new(roar_hash_t algo) {
  struct roar_hash_cmds  * cmds = roar_ht2cmds(algo);
  struct roar_hash_state * self;
@@ -397 +397 @@
 }
 
-int roar_hash_buffer(void * digest, const void * data, size_t datalen, int algo) {
+int roar_hash_buffer(void * digest, const void * data, size_t datalen, roar_hash_t algo) {
  roar_crypto_init();
 
@@ -404 +404 @@
 
 #ifdef ROAR_HAVE_LIBGCRYPT
-static inline int roar_hash_salted_buffer_gcrypt(void * digest, const void * data, size_t datalen, int algo, const void * salt, size_t saltlen) {
+static inline int roar_hash_salted_buffer_gcrypt(void * digest, const void * data, size_t datalen, roar_hash_t algo, const void * salt, size_t saltlen) {
  gcry_md_hd_t hdl;
 
@@ -434 +434 @@
 #endif
 
-int roar_hash_salted_buffer(void * digest, const void * data, size_t datalen, int algo, const void * salt, size_t saltlen) {
+int roar_hash_salted_buffer(void * digest, const void * data, size_t datalen, roar_hash_t algo, const void * salt, size_t saltlen) {
  struct roar_hash_state * state;
  size_t len;