nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

dirvote: Rename authority_cert_dup()

Browse Source 
Renamed to follow the file namespace.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-04-25 10:05:30 -04:00
parent 43bee06dd0
commit 35ff2a3b86
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/dirserv.c
View File

@ -3131,7 +3131,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
v3_out->voters = smartlist_new(); v3_out->voters = smartlist_new();
smartlist_add(v3_out->voters, voter); smartlist_add(v3_out->voters, voter);
v3_out->cert = authority_cert_dup(cert); v3_out->cert = dirvote_authority_cert_dup(cert);
v3_out->routerstatus_list = routerstatuses; v3_out->routerstatus_list = routerstatuses;
/* Note: networkstatus_digest is unset; it won't get set until we actually /* Note: networkstatus_digest is unset; it won't get set until we actually
* format the vote. */ * format the vote. */

2
src/or/dirvote_common.c
View File

@ -200,7 +200,7 @@ dirvote_get_voter_sig_by_alg(const networkstatus_voter_info_t *voter,
/** Allocate and return a new authority_cert_t with the same contents as /** Allocate and return a new authority_cert_t with the same contents as
* <b>cert</b>. */ * <b>cert</b>. */
authority_cert_t * authority_cert_t *
authority_cert_dup(authority_cert_t *cert) dirvote_authority_cert_dup(authority_cert_t *cert)
{ {
authority_cert_t *out = tor_malloc(sizeof(authority_cert_t)); authority_cert_t *out = tor_malloc(sizeof(authority_cert_t));
tor_assert(cert); tor_assert(cert);

2
src/or/dirvote_common.h
View File

@ -63,7 +63,7 @@ document_signature_t *dirvote_get_voter_sig_by_alg(
digest_algorithm_t alg); digest_algorithm_t alg);
/* Cert manipulation */ /* Cert manipulation */
authority_cert_t *authority_cert_dup(authority_cert_t *cert); authority_cert_t *dirvote_authority_cert_dup(authority_cert_t *cert);
#endif /* TOR_DIRVOTE_COMMON_H */ #endif /* TOR_DIRVOTE_COMMON_H */

6
src/test/test_dir_common.c
View File

@ -307,7 +307,7 @@ dir_common_construct_vote_1(networkstatus_t **vote, authority_cert_t *cert,
* Set up a vote; generate it; try to parse it. * Set up a vote; generate it; try to parse it.
*/ */
smartlist_add((*vote)->voters, voter); smartlist_add((*vote)->voters, voter);
(*vote)->cert = authority_cert_dup(cert); (*vote)->cert = dirvote_authority_cert_dup(cert);
smartlist_split_string((*vote)->net_params, "circuitwindow=101 foo=990", smartlist_split_string((*vote)->net_params, "circuitwindow=101 foo=990",
NULL, 0, 0); NULL, 0, 0);
*n_vrs = 0; *n_vrs = 0;
@ -356,7 +356,7 @@ dir_common_construct_vote_2(networkstatus_t **vote, authority_cert_t *cert,
* Set up a vote; generate it; try to parse it. * Set up a vote; generate it; try to parse it.
*/ */
smartlist_add((*vote)->voters, voter); smartlist_add((*vote)->voters, voter);
(*vote)->cert = authority_cert_dup(cert); (*vote)->cert = dirvote_authority_cert_dup(cert);
if (! (*vote)->net_params) if (! (*vote)->net_params)
(*vote)->net_params = smartlist_new(); (*vote)->net_params = smartlist_new();
smartlist_split_string((*vote)->net_params, smartlist_split_string((*vote)->net_params,
@ -407,7 +407,7 @@ dir_common_construct_vote_3(networkstatus_t **vote, authority_cert_t *cert,
* Set up a vote; generate it; try to parse it. * Set up a vote; generate it; try to parse it.
*/ */
smartlist_add((*vote)->voters, voter); smartlist_add((*vote)->voters, voter);
(*vote)->cert = authority_cert_dup(cert); (*vote)->cert = dirvote_authority_cert_dup(cert);
smartlist_split_string((*vote)->net_params, "circuitwindow=80 foo=660", smartlist_split_string((*vote)->net_params, "circuitwindow=80 foo=660",
NULL, 0, 0); NULL, 0, 0);
/* add routerstatuses */ /* add routerstatuses */