mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
dirvote: Trim down the public API
Many functions become static to the C file or exposed to the tests within the PRIVATE define of dirvote.h. This commit moves a function to the top. No code behavior change. Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
parent
f0838e7257
commit
d177067860
104
src/or/dirvote.c
104
src/or/dirvote.c
@ -351,6 +351,53 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
|
|||||||
* Consensus generation
|
* Consensus generation
|
||||||
* ===== */
|
* ===== */
|
||||||
|
|
||||||
|
/** If <b>vrs</b> has a hash made for the consensus method <b>method</b> with
|
||||||
|
* the digest algorithm <b>alg</b>, decode it and copy it into
|
||||||
|
* <b>digest256_out</b> and return 0. Otherwise return -1. */
|
||||||
|
static int
|
||||||
|
vote_routerstatus_find_microdesc_hash(char *digest256_out,
|
||||||
|
const vote_routerstatus_t *vrs,
|
||||||
|
int method,
|
||||||
|
digest_algorithm_t alg)
|
||||||
|
{
|
||||||
|
/* XXXX only returns the sha256 method. */
|
||||||
|
const vote_microdesc_hash_t *h;
|
||||||
|
char mstr[64];
|
||||||
|
size_t mlen;
|
||||||
|
char dstr[64];
|
||||||
|
|
||||||
|
tor_snprintf(mstr, sizeof(mstr), "%d", method);
|
||||||
|
mlen = strlen(mstr);
|
||||||
|
tor_snprintf(dstr, sizeof(dstr), " %s=",
|
||||||
|
crypto_digest_algorithm_get_name(alg));
|
||||||
|
|
||||||
|
for (h = vrs->microdesc; h; h = h->next) {
|
||||||
|
const char *cp = h->microdesc_hash_line;
|
||||||
|
size_t num_len;
|
||||||
|
/* cp looks like \d+(,\d+)* (digesttype=val )+ . Let's hunt for mstr in
|
||||||
|
* the first part. */
|
||||||
|
while (1) {
|
||||||
|
num_len = strspn(cp, "1234567890");
|
||||||
|
if (num_len == mlen && fast_memeq(mstr, cp, mlen)) {
|
||||||
|
/* This is the line. */
|
||||||
|
char buf[BASE64_DIGEST256_LEN+1];
|
||||||
|
/* XXXX ignores extraneous stuff if the digest is too long. This
|
||||||
|
* seems harmless enough, right? */
|
||||||
|
cp = strstr(cp, dstr);
|
||||||
|
if (!cp)
|
||||||
|
return -1;
|
||||||
|
cp += strlen(dstr);
|
||||||
|
strlcpy(buf, cp, sizeof(buf));
|
||||||
|
return digest256_from_base64(digest256_out, buf);
|
||||||
|
}
|
||||||
|
if (num_len == 0 || cp[num_len] != ',')
|
||||||
|
break;
|
||||||
|
cp += num_len + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/** Given a vote <b>vote</b> (not a consensus!), return its associated
|
/** Given a vote <b>vote</b> (not a consensus!), return its associated
|
||||||
* networkstatus_voter_info_t. */
|
* networkstatus_voter_info_t. */
|
||||||
static networkstatus_voter_info_t *
|
static networkstatus_voter_info_t *
|
||||||
@ -1328,7 +1375,7 @@ compute_nth_protocol_set(int n, int n_voters, const smartlist_t *votes)
|
|||||||
* behavior, and make the new behavior conditional on a new-enough
|
* behavior, and make the new behavior conditional on a new-enough
|
||||||
* consensus_method.
|
* consensus_method.
|
||||||
**/
|
**/
|
||||||
char *
|
STATIC char *
|
||||||
networkstatus_compute_consensus(smartlist_t *votes,
|
networkstatus_compute_consensus(smartlist_t *votes,
|
||||||
int total_authorities,
|
int total_authorities,
|
||||||
crypto_pk_t *identity_key,
|
crypto_pk_t *identity_key,
|
||||||
@ -2372,7 +2419,7 @@ compute_consensus_package_lines(smartlist_t *votes)
|
|||||||
* new signature is verifiable.) Return the number of signatures added or
|
* new signature is verifiable.) Return the number of signatures added or
|
||||||
* changed, or -1 if the document signed by <b>sigs</b> isn't the same
|
* changed, or -1 if the document signed by <b>sigs</b> isn't the same
|
||||||
* document as <b>target</b>. */
|
* document as <b>target</b>. */
|
||||||
int
|
STATIC int
|
||||||
networkstatus_add_detached_signatures(networkstatus_t *target,
|
networkstatus_add_detached_signatures(networkstatus_t *target,
|
||||||
ns_detached_signatures_t *sigs,
|
ns_detached_signatures_t *sigs,
|
||||||
const char *source,
|
const char *source,
|
||||||
@ -2564,7 +2611,7 @@ networkstatus_format_signatures(networkstatus_t *consensus,
|
|||||||
* corresponding to the signatures on <b>consensuses</b>, which must contain
|
* corresponding to the signatures on <b>consensuses</b>, which must contain
|
||||||
* exactly one FLAV_NS consensus, and no more than one consensus for each
|
* exactly one FLAV_NS consensus, and no more than one consensus for each
|
||||||
* other flavor. */
|
* other flavor. */
|
||||||
char *
|
STATIC char *
|
||||||
networkstatus_get_detached_signatures(smartlist_t *consensuses)
|
networkstatus_get_detached_signatures(smartlist_t *consensuses)
|
||||||
{
|
{
|
||||||
smartlist_t *elements;
|
smartlist_t *elements;
|
||||||
@ -3798,7 +3845,7 @@ dirvote_get_vote(const char *fp, int flags)
|
|||||||
/** Construct and return a new microdescriptor from a routerinfo <b>ri</b>
|
/** Construct and return a new microdescriptor from a routerinfo <b>ri</b>
|
||||||
* according to <b>consensus_method</b>.
|
* according to <b>consensus_method</b>.
|
||||||
**/
|
**/
|
||||||
microdesc_t *
|
STATIC microdesc_t *
|
||||||
dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method)
|
dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method)
|
||||||
{
|
{
|
||||||
microdesc_t *result = NULL;
|
microdesc_t *result = NULL;
|
||||||
@ -3893,7 +3940,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method)
|
|||||||
* in a consensus vote document. Write it into the <b>out_len</b>-byte buffer
|
* in a consensus vote document. Write it into the <b>out_len</b>-byte buffer
|
||||||
* in <b>out</b>. Return -1 on failure and the number of characters written
|
* in <b>out</b>. Return -1 on failure and the number of characters written
|
||||||
* on success. */
|
* on success. */
|
||||||
ssize_t
|
static ssize_t
|
||||||
dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len,
|
dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len,
|
||||||
const microdesc_t *md,
|
const microdesc_t *md,
|
||||||
int consensus_method_low,
|
int consensus_method_low,
|
||||||
@ -4001,50 +4048,3 @@ dirvote_format_all_microdesc_vote_lines(const routerinfo_t *ri, time_t now,
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** If <b>vrs</b> has a hash made for the consensus method <b>method</b> with
|
|
||||||
* the digest algorithm <b>alg</b>, decode it and copy it into
|
|
||||||
* <b>digest256_out</b> and return 0. Otherwise return -1. */
|
|
||||||
int
|
|
||||||
vote_routerstatus_find_microdesc_hash(char *digest256_out,
|
|
||||||
const vote_routerstatus_t *vrs,
|
|
||||||
int method,
|
|
||||||
digest_algorithm_t alg)
|
|
||||||
{
|
|
||||||
/* XXXX only returns the sha256 method. */
|
|
||||||
const vote_microdesc_hash_t *h;
|
|
||||||
char mstr[64];
|
|
||||||
size_t mlen;
|
|
||||||
char dstr[64];
|
|
||||||
|
|
||||||
tor_snprintf(mstr, sizeof(mstr), "%d", method);
|
|
||||||
mlen = strlen(mstr);
|
|
||||||
tor_snprintf(dstr, sizeof(dstr), " %s=",
|
|
||||||
crypto_digest_algorithm_get_name(alg));
|
|
||||||
|
|
||||||
for (h = vrs->microdesc; h; h = h->next) {
|
|
||||||
const char *cp = h->microdesc_hash_line;
|
|
||||||
size_t num_len;
|
|
||||||
/* cp looks like \d+(,\d+)* (digesttype=val )+ . Let's hunt for mstr in
|
|
||||||
* the first part. */
|
|
||||||
while (1) {
|
|
||||||
num_len = strspn(cp, "1234567890");
|
|
||||||
if (num_len == mlen && fast_memeq(mstr, cp, mlen)) {
|
|
||||||
/* This is the line. */
|
|
||||||
char buf[BASE64_DIGEST256_LEN+1];
|
|
||||||
/* XXXX ignores extraneous stuff if the digest is too long. This
|
|
||||||
* seems harmless enough, right? */
|
|
||||||
cp = strstr(cp, dstr);
|
|
||||||
if (!cp)
|
|
||||||
return -1;
|
|
||||||
cp += strlen(dstr);
|
|
||||||
strlcpy(buf, cp, sizeof(buf));
|
|
||||||
return digest256_from_base64(digest256_out, buf);
|
|
||||||
}
|
|
||||||
if (num_len == 0 || cp[num_len] != ',')
|
|
||||||
break;
|
|
||||||
cp += num_len + 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -89,19 +89,6 @@
|
|||||||
void dirvote_free_all(void);
|
void dirvote_free_all(void);
|
||||||
|
|
||||||
/* vote manipulation */
|
/* vote manipulation */
|
||||||
char *networkstatus_compute_consensus(smartlist_t *votes,
|
|
||||||
int total_authorities,
|
|
||||||
crypto_pk_t *identity_key,
|
|
||||||
crypto_pk_t *signing_key,
|
|
||||||
const char *legacy_identity_key_digest,
|
|
||||||
crypto_pk_t *legacy_signing_key,
|
|
||||||
consensus_flavor_t flavor);
|
|
||||||
int networkstatus_add_detached_signatures(networkstatus_t *target,
|
|
||||||
ns_detached_signatures_t *sigs,
|
|
||||||
const char *source,
|
|
||||||
int severity,
|
|
||||||
const char **msg_out);
|
|
||||||
char *networkstatus_get_detached_signatures(smartlist_t *consensuses);
|
|
||||||
void ns_detached_signatures_free_(ns_detached_signatures_t *s);
|
void ns_detached_signatures_free_(ns_detached_signatures_t *s);
|
||||||
#define ns_detached_signatures_free(s) \
|
#define ns_detached_signatures_free(s) \
|
||||||
FREE_AND_NULL(ns_detached_signatures_t, ns_detached_signatures_free_, (s))
|
FREE_AND_NULL(ns_detached_signatures_t, ns_detached_signatures_free_, (s))
|
||||||
@ -178,21 +165,11 @@ networkstatus_t *
|
|||||||
dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
|
dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
|
||||||
authority_cert_t *cert);
|
authority_cert_t *cert);
|
||||||
|
|
||||||
microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
|
|
||||||
int consensus_method);
|
|
||||||
ssize_t dirvote_format_microdesc_vote_line(char *out, size_t out_len,
|
|
||||||
const microdesc_t *md,
|
|
||||||
int consensus_method_low,
|
|
||||||
int consensus_method_high);
|
|
||||||
vote_microdesc_hash_t *dirvote_format_all_microdesc_vote_lines(
|
vote_microdesc_hash_t *dirvote_format_all_microdesc_vote_lines(
|
||||||
const routerinfo_t *ri,
|
const routerinfo_t *ri,
|
||||||
time_t now,
|
time_t now,
|
||||||
smartlist_t *microdescriptors_out);
|
smartlist_t *microdescriptors_out);
|
||||||
|
|
||||||
int vote_routerstatus_find_microdesc_hash(char *digest256_out,
|
|
||||||
const vote_routerstatus_t *vrs,
|
|
||||||
int method,
|
|
||||||
digest_algorithm_t alg);
|
|
||||||
document_signature_t *voter_get_sig_by_algorithm(
|
document_signature_t *voter_get_sig_by_algorithm(
|
||||||
const networkstatus_voter_info_t *voter,
|
const networkstatus_voter_info_t *voter,
|
||||||
digest_algorithm_t alg);
|
digest_algorithm_t alg);
|
||||||
@ -212,6 +189,25 @@ STATIC int
|
|||||||
networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G,
|
networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G,
|
||||||
int64_t M, int64_t E, int64_t D,
|
int64_t M, int64_t E, int64_t D,
|
||||||
int64_t T, int64_t weight_scale);
|
int64_t T, int64_t weight_scale);
|
||||||
|
STATIC
|
||||||
|
char *networkstatus_compute_consensus(smartlist_t *votes,
|
||||||
|
int total_authorities,
|
||||||
|
crypto_pk_t *identity_key,
|
||||||
|
crypto_pk_t *signing_key,
|
||||||
|
const char *legacy_identity_key_digest,
|
||||||
|
crypto_pk_t *legacy_signing_key,
|
||||||
|
consensus_flavor_t flavor);
|
||||||
|
STATIC
|
||||||
|
int networkstatus_add_detached_signatures(networkstatus_t *target,
|
||||||
|
ns_detached_signatures_t *sigs,
|
||||||
|
const char *source,
|
||||||
|
int severity,
|
||||||
|
const char **msg_out);
|
||||||
|
STATIC
|
||||||
|
char *networkstatus_get_detached_signatures(smartlist_t *consensuses);
|
||||||
|
STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
|
||||||
|
int consensus_method);
|
||||||
|
|
||||||
#endif /* defined(DIRVOTE_PRIVATE) */
|
#endif /* defined(DIRVOTE_PRIVATE) */
|
||||||
|
|
||||||
#endif /* !defined(TOR_DIRVOTE_H) */
|
#endif /* !defined(TOR_DIRVOTE_H) */
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#include "or.h"
|
#include "or.h"
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#define DIRVOTE_PRIVATE
|
||||||
#include "dirvote.h"
|
#include "dirvote.h"
|
||||||
#include "microdesc.h"
|
#include "microdesc.h"
|
||||||
#include "networkstatus.h"
|
#include "networkstatus.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user