nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove digest[12]_hex

Browse Source
This commit is contained in:
Nick Mathewson 2017-03-07 11:42:24 -05:00
parent c6046f4db8
commit f193b666cd
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/or/consdiff.c
View File

@ -846,14 +846,13 @@ consdiff_gen_diff(smartlist_t *cons1, smartlist_t *cons2,
} }
/** Fetch the digest of the base consensus in the consensus diff, encoded in /** Fetch the digest of the base consensus in the consensus diff, encoded in
* base16 as found in the diff itself. digest1 and digest2 must be of length * base16 as found in the diff itself. digest1_out and digest2_out must be of
* DIGEST256_LEN or larger if not NULL. digest1_hex and digest2_hex must be of * length DIGEST256_LEN or larger if not NULL.
* length HEX_DIGEST256_LEN or larger if not NULL.
*/ */
int int
consdiff_get_digests(smartlist_t *diff, consdiff_get_digests(smartlist_t *diff,
char *digest1, char *digest1_hex, char *digest1_out,
char *digest2, char *digest2_hex) char *digest2_out)
{ {
smartlist_t *hash_words = NULL; smartlist_t *hash_words = NULL;
const char *format; const char *format;
@ -897,13 +896,6 @@ consdiff_get_digests(smartlist_t *diff,
goto error_cleanup; goto error_cleanup;
} }
if (digest1_hex) {
strlcpy(digest1_hex, cons1_hash_hex, HEX_DIGEST256_LEN+1);
}
if (digest2_hex) {
strlcpy(digest2_hex, cons2_hash_hex, HEX_DIGEST256_LEN+1);
}
if (base16_decode(cons1_hash, DIGEST256_LEN, if (base16_decode(cons1_hash, DIGEST256_LEN,
cons1_hash_hex, HEX_DIGEST256_LEN) != DIGEST256_LEN || cons1_hash_hex, HEX_DIGEST256_LEN) != DIGEST256_LEN ||
base16_decode(cons2_hash, DIGEST256_LEN, base16_decode(cons2_hash, DIGEST256_LEN,
@ -913,11 +905,11 @@ consdiff_get_digests(smartlist_t *diff,
goto error_cleanup; goto error_cleanup;
} }
if (digest1) { if (digest1_out) {
memcpy(digest1, cons1_hash, DIGEST256_LEN); memcpy(digest1_out, cons1_hash, DIGEST256_LEN);
} }
if (digest2) { if (digest2_out) {
memcpy(digest2, cons2_hash, DIGEST256_LEN); memcpy(digest2_out, cons2_hash, DIGEST256_LEN);
} }
SMARTLIST_FOREACH(hash_words, char *, cp, tor_free(cp)); SMARTLIST_FOREACH(hash_words, char *, cp, tor_free(cp));
@ -947,8 +939,7 @@ consdiff_apply_diff(smartlist_t *cons1, smartlist_t *diff,
char e_cons1_hash[DIGEST256_LEN]; char e_cons1_hash[DIGEST256_LEN];
char e_cons2_hash[DIGEST256_LEN]; char e_cons2_hash[DIGEST256_LEN];
if (consdiff_get_digests(diff, if (consdiff_get_digests(diff, e_cons1_hash, e_cons2_hash) != 0) {
e_cons1_hash, NULL, e_cons2_hash, NULL) != 0) {
goto error_cleanup; goto error_cleanup;
} }

4
src/or/consdiff.h
View File

@ -12,8 +12,8 @@ smartlist_t *consdiff_gen_diff(smartlist_t *cons1, smartlist_t *cons2,
char *consdiff_apply_diff(smartlist_t *cons1, smartlist_t *diff, char *consdiff_apply_diff(smartlist_t *cons1, smartlist_t *diff,
common_digests_t *digests1); common_digests_t *digests1);
int consdiff_get_digests(smartlist_t *diff, int consdiff_get_digests(smartlist_t *diff,
char *digest1, char *digest1_hex, char *digest1_out,
char *digest2, char *digest2_hex); char *digest2_out);
#ifdef CONSDIFF_PRIVATE #ifdef CONSDIFF_PRIVATE
/** Data structure to define a slice of a smarltist. */ /** Data structure to define a slice of a smarltist. */