Changeset 5188:15479bc3b330 in roaraudio
- Timestamp:
- 10/23/11 02:02:34 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/hash.c
r4878 r5188 117 117 return &(_libroar_hash_cmds[i]); 118 118 119 roar_err_set(ROAR_ERROR_NOENT); 119 120 return NULL; 120 121 } … … 149 150 return _libroar_hashes[i].name; 150 151 152 roar_err_set(ROAR_ERROR_NOENT); 151 153 return NULL; 152 154 } … … 159 161 return _libroar_hashes[i].id; 160 162 163 roar_err_set(ROAR_ERROR_NOENT); 161 164 return -1; 162 165 } … … 169 172 return _libroar_hashes[i].dlen; 170 173 174 roar_err_set(ROAR_ERROR_NOENT); 171 175 return -1; 172 176 } … … 293 297 294 298 out[outlen-1] = 0; 295 return strlen(out);299 return roar_mm_strlen(out); 296 300 } 297 301 … … 351 355 int ret = 0; 352 356 353 if ( state == NULL ) 354 return -1; 357 if ( state == NULL ) { 358 roar_err_set(ROAR_ERROR_FAULT); 359 return -1; 360 } 355 361 356 362 if ( state->cmds->uninit != NULL ) … … 364 370 365 371 int roar_hash_digest(struct roar_hash_state * state, void * digest, size_t * len) { 366 if ( state == NULL ) 367 return -1; 368 369 if ( state->cmds->digest == NULL ) 370 return -1; 372 if ( state == NULL ) { 373 roar_err_set(ROAR_ERROR_FAULT); 374 return -1; 375 } 376 377 if ( state->cmds->digest == NULL ) { 378 roar_err_set(ROAR_ERROR_NOSYS); 379 return -1; 380 } 371 381 372 382 return state->cmds->digest(state->state, digest, len); … … 374 384 375 385 int roar_hash_proc(struct roar_hash_state * state, const void * data, size_t len) { 376 if ( state == NULL ) 377 return -1; 378 379 if ( state->cmds->proc == NULL ) 380 return -1; 386 if ( state == NULL ) { 387 roar_err_set(ROAR_ERROR_FAULT); 388 return -1; 389 } 390 391 if ( state->cmds->proc == NULL ) { 392 roar_err_set(ROAR_ERROR_NOSYS); 393 return -1; 394 } 381 395 382 396 return state->cmds->proc(state->state, data, len); … … 427 441 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); 428 442 429 if ( digest == NULL || data == NULL ) 430 return -1; 443 if ( digest == NULL || data == NULL ) { 444 roar_err_set(ROAR_ERROR_FAULT); 445 return -1; 446 } 431 447 432 448 len = roar_ht_digestlen(algo); … … 466 482 return roar_hash_salted_buffer_gcrypt(digest, data, datalen, algo, salt, saltlen); 467 483 #else 484 roar_err_set(ROAR_ERROR_NOTSUP); 468 485 return -1; 469 486 #endif
Note: See TracChangeset
for help on using the changeset viewer.