diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-02-10 15:35:46 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-02-10 15:35:46 -0500 |
commit | a8d69895897056fcc313914e9d611d3c9008e17c (patch) | |
tree | f670ff0aa4e1a75de248dff8b5de2ff22d5ced5c | |
parent | 9746aed2baffeb3788552f8cdedc5611ab2f91b7 (diff) | |
download | tor-a8d69895897056fcc313914e9d611d3c9008e17c.tar.gz tor-a8d69895897056fcc313914e9d611d3c9008e17c.zip |
Whitespace fixes
-rw-r--r-- | src/common/crypto.h | 4 | ||||
-rw-r--r-- | src/common/tortls.h | 6 | ||||
-rw-r--r-- | src/or/channeltls.c | 3 | ||||
-rw-r--r-- | src/or/dirserv.h | 6 | ||||
-rw-r--r-- | src/or/routerparse.c | 3 | ||||
-rw-r--r-- | src/or/routerparse.h | 3 | ||||
-rw-r--r-- | src/test/test_dir.c | 6 |
7 files changed, 19 insertions, 12 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index f1e4981193..9535c4ec0f 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -102,7 +102,6 @@ typedef enum { #define N_DIGEST_ALGORITHMS (DIGEST_SHA3_512+1) #define N_COMMON_DIGEST_ALGORITHMS (DIGEST_SHA256+1) - /** A set of all the digests we commonly compute, taken on a single * string. Any digests that are shorter than 512 bits are right-padded * with 0 bits. @@ -193,7 +192,8 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char *to, int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len); crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out); -int crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out); +int crypto_pk_get_common_digests(crypto_pk_t *pk, + common_digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out); diff --git a/src/common/tortls.h b/src/common/tortls.h index 97ca8fda7d..d235ca5756 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -237,8 +237,10 @@ tor_x509_cert_t *tor_x509_cert_decode(const uint8_t *certificate, size_t certificate_len); void tor_x509_cert_get_der(const tor_x509_cert_t *cert, const uint8_t **encoded_out, size_t *size_out); -const common_digests_t *tor_x509_cert_get_id_digests(const tor_x509_cert_t *cert); -const common_digests_t *tor_x509_cert_get_cert_digests(const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_id_digests( + const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_cert_digests( + const tor_x509_cert_t *cert); int tor_tls_get_my_certs(int server, const tor_x509_cert_t **link_cert_out, const tor_x509_cert_t **id_cert_out); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index a4c570833e..016ef75456 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1819,7 +1819,8 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) chan->conn->handshake_state->authenticated = 1; { - const common_digests_t *id_digests = tor_x509_cert_get_id_digests(id_cert); + const common_digests_t *id_digests = + tor_x509_cert_get_id_digests(id_cert); crypto_pk_t *identity_rcvd; if (!id_digests) ERR("Couldn't compute digests for key in ID cert"); diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 25a2a9130b..df23450ef9 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -63,9 +63,9 @@ int directory_too_idle_to_fetch_descriptors(const or_options_t *options, cached_dir_t *dirserv_get_consensus(const char *flavor_name); void dirserv_set_cached_consensus_networkstatus(const char *consensus, - const char *flavor_name, - const common_digests_t *digests, - time_t published); + const char *flavor_name, + const common_digests_t *digests, + time_t published); void dirserv_clear_old_networkstatuses(time_t cutoff); int dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key, const char **msg, diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7323f8012a..2173213e49 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3445,7 +3445,8 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, /** Return the common_digests_t that holds the digests of the * <b>flavor_name</b>-flavored networkstatus according to the detached - * signatures document <b>sigs</b>, allocating a new common_digests_t as neeeded. */ + * signatures document <b>sigs</b>, allocating a new common_digests_t as + * neeeded. */ static common_digests_t * detached_get_digests(ns_detached_signatures_t *sigs, const char *flavor_name) { diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 47457406c2..723d5d8945 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -14,7 +14,8 @@ int router_get_router_hash(const char *s, size_t s_len, char *digest); int router_get_dir_hash(const char *s, char *digest); -int router_get_networkstatus_v3_hashes(const char *s, common_digests_t *digests); +int router_get_networkstatus_v3_hashes(const char *s, + common_digests_t *digests); int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest); #define DIROBJ_MAX_SIG_LEN 256 char *router_get_dirobj_signature(const char *digest, diff --git a/src/test/test_dir.c b/src/test/test_dir.c index b770047c0d..ef36303863 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2002,8 +2002,10 @@ test_a_networkstatus( tt_mem_op(&con->digests,OP_EQ, &con2->digests, sizeof(common_digests_t)); tt_mem_op(&con->digests,OP_EQ, &con3->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, + sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, + sizeof(common_digests_t)); /* Extract a detached signature from con3. */ detached_text1 = get_detached_sigs(con3, con_md3); |