Changeset 5284:3fcf039ca02c in roaraudio for libroar
- Timestamp:
- 11/22/11 12:53:18 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/hash.c
r5270 r5284 46 46 47 47 static const struct hashes { 48 const uint_least32_tid;48 const roar_hash_t id; 49 49 const char * name; 50 50 const ssize_t dlen; … … 110 110 }; 111 111 112 static struct roar_hash_cmds * roar_ht2cmds(const int ht) {112 static struct roar_hash_cmds * roar_ht2cmds(const roar_hash_t ht) { 113 113 size_t i; 114 114 115 for(i = 0; _libroar_hash_cmds[i].algo != -1; i++)115 for(i = 0; _libroar_hash_cmds[i].algo != (roar_hash_t)-1; i++) 116 116 if ( _libroar_hash_cmds[i].algo == ht ) 117 117 return &(_libroar_hash_cmds[i]); … … 121 121 } 122 122 123 static inline int roar_ht2gcrypt_tested (const int ht) {123 static inline int roar_ht2gcrypt_tested (const roar_hash_t ht) { 124 124 #ifdef ROAR_HAVE_LIBGCRYPT 125 125 const char * name; … … 143 143 } 144 144 145 const char * roar_ht2str (const intht) {145 const char * roar_ht2str (const roar_hash_t ht) { 146 146 int i; 147 147 148 for (i = 0; _libroar_hashes[i].id != ( uint_least32_t)-1; i++)148 for (i = 0; _libroar_hashes[i].id != (roar_hash_t)-1; i++) 149 149 if ( _libroar_hashes[i].id == ht ) 150 150 return _libroar_hashes[i].name; … … 154 154 } 155 155 156 introar_str2ht (const char * ht) {156 roar_hash_t roar_str2ht (const char * ht) { 157 157 int i; 158 158 159 for (i = 0; _libroar_hashes[i].id != ( uint_least32_t)-1; i++)159 for (i = 0; _libroar_hashes[i].id != (roar_hash_t)-1; i++) 160 160 if ( !strcasecmp(_libroar_hashes[i].name, ht) ) 161 161 return _libroar_hashes[i].id; … … 165 165 } 166 166 167 ssize_t roar_ht_digestlen (const intht) {167 ssize_t roar_ht_digestlen (const roar_hash_t ht) { 168 168 int i; 169 169 … … 192 192 } 193 193 194 ssize_t roar_hash_digest2str(char * out, size_t outlen, void * digest, size_t digestlen, int ht) {194 ssize_t roar_hash_digest2str(char * out, size_t outlen, void * digest, size_t digestlen, roar_hash_t ht) { 195 195 ssize_t slen = roar_ht_digestlen(ht); 196 196 union { … … 300 300 } 301 301 302 int roar_ht_is_supported(const intht) {302 int roar_ht_is_supported(const roar_hash_t ht) { 303 303 roar_crypto_init(); 304 304 … … 316 316 } 317 317 318 struct roar_hash_state * roar_hash_new( int algo) {318 struct roar_hash_state * roar_hash_new(roar_hash_t algo) { 319 319 struct roar_hash_cmds * cmds = roar_ht2cmds(algo); 320 320 struct roar_hash_state * self; … … 397 397 } 398 398 399 int roar_hash_buffer(void * digest, const void * data, size_t datalen, int algo) {399 int roar_hash_buffer(void * digest, const void * data, size_t datalen, roar_hash_t algo) { 400 400 roar_crypto_init(); 401 401 … … 404 404 405 405 #ifdef ROAR_HAVE_LIBGCRYPT 406 static inline int roar_hash_salted_buffer_gcrypt(void * digest, const void * data, size_t datalen, int algo, const void * salt, size_t saltlen) {406 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) { 407 407 gcry_md_hd_t hdl; 408 408 … … 434 434 #endif 435 435 436 int roar_hash_salted_buffer(void * digest, const void * data, size_t datalen, int algo, const void * salt, size_t saltlen) {436 int roar_hash_salted_buffer(void * digest, const void * data, size_t datalen, roar_hash_t algo, const void * salt, size_t saltlen) { 437 437 struct roar_hash_state * state; 438 438 size_t len;
Note: See TracChangeset
for help on using the changeset viewer.