[tor-commits] [tor/maint-0.2.8] whitespace fixes

[nickm]

commit bc9a0f82b3436dad2aa09c1b68c0c230751d48dd
Author: Nick Mathewson 
Date:   Tue Jun 28 11:14:42 2016 -0400

whitespace fixes
---
 src/or/connection_or.c | 2 +-
 src/or/routerlist.c| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5c4461f..9730e1a 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1750,7 +1750,7 @@ connection_or_client_learned_peer_id(or_connection_t 
*conn,
 const int is_fallback_fingerprint = router_digest_is_fallback_dir(
conn->identity_digest);
 const int is_authority_fingerprint = router_digest_is_trusted_dir(
-  
conn->identity_digest);
+   conn->identity_digest);
 int severity;
 const char *extra_log = "";
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 432c64d..49d7680 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1408,7 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char 
*digest)
  * or 0 if no such fallback is in the list of fallback_dir_servers.
  * (fallback_dir_servers is affected by the FallbackDir and
  * UseDefaultFallbackDirs torrc options.)
- * The list of fallback directories includes the list of authorities.
+ * The list of fallback directories includes the list of authorities.
  */
 int
 router_digest_is_fallback_dir(const char *digest)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.8] whitespace fixes

[nickm]

commit 2729f166cb715f0f4aff8779f0fadebafc56a70c
Author: Nick Mathewson 
Date:   Tue May 17 20:08:03 2016 -0400

whitespace fixes
---
 src/or/dirserv.c |  5 +++--
 src/or/router.c  | 15 ---
 src/or/routerlist.c  |  3 ++-
 src/or/routerparse.c |  7 ---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index c97e3bc..dafaed8 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -261,7 +261,7 @@ dirserv_router_get_status(const routerinfo_t *router, const 
char **msg,
 /* This has an ed25519 identity key. */
 if (KEYPIN_MISMATCH ==
 keypin_check((const uint8_t*)router->cache_info.identity_digest,
- router->cache_info.signing_key_cert->signing_key.pubkey)) 
{
+   router->cache_info.signing_key_cert->signing_key.pubkey)) {
   log_fn(severity, LD_DIR,
  "Descriptor from router %s has an Ed25519 key, "
"but the  keys don't match what they were before.",
@@ -2898,7 +2898,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
listbadexits);
 
   if (ri->cache_info.signing_key_cert) {
-memcpy(vrs->ed25519_id, 
ri->cache_info.signing_key_cert->signing_key.pubkey,
+memcpy(vrs->ed25519_id,
+   ri->cache_info.signing_key_cert->signing_key.pubkey,
ED25519_PUBKEY_LEN);
   }
 
diff --git a/src/or/router.c b/src/or/router.c
index 772a855..aa4acf6 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2036,7 +2036,8 @@ router_build_fresh_descriptor(routerinfo_t **r, 
extrainfo_t **e)
 routerinfo_free(ri);
 return -1;
   }
-  ri->cache_info.signing_key_cert = 
tor_cert_dup(get_master_signing_key_cert());
+  ri->cache_info.signing_key_cert =
+tor_cert_dup(get_master_signing_key_cert());
 
   get_platform_str(platform, sizeof(platform));
   ri->platform = tor_strdup(platform);
@@ -2560,9 +2561,9 @@ router_dump_router_to_string(routerinfo_t *router,
 char ed_cert_base64[256];
 char ed_fp_base64[ED25519_BASE64_LEN+1];
 if (base64_encode(ed_cert_base64, sizeof(ed_cert_base64),
-  (const 
char*)router->cache_info.signing_key_cert->encoded,
-  router->cache_info.signing_key_cert->encoded_len,
-  BASE64_ENCODE_MULTILINE) < 0) {
+(const char*)router->cache_info.signing_key_cert->encoded,
+router->cache_info.signing_key_cert->encoded_len,
+BASE64_ENCODE_MULTILINE) < 0) {
   log_err(LD_BUG,"Couldn't base64-encode signing key certificate!");
   goto err;
 }
@@ -2600,9 +2601,9 @@ router_dump_router_to_string(routerinfo_t *router,
 int tap_cc_len = 0;
 uint8_t *tap_cc =
   make_tap_onion_key_crosscert(tap_key,
-   
>cache_info.signing_key_cert->signing_key,
-   router->identity_pkey,
-   _cc_len);
+>cache_info.signing_key_cert->signing_key,
+router->identity_pkey,
+_cc_len);
 if (!tap_cc) {
   log_warn(LD_BUG,"make_tap_onion_key_crosscert failed!");
   goto err;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2634e0d..f9247cb 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5215,7 +5215,8 @@ routerinfo_incompatible_with_extrainfo(const crypto_pk_t 
*identity_pkey,
 goto err; /* different servers */
   }
 
-  if (! tor_cert_opt_eq(sd->signing_key_cert,ei->cache_info.signing_key_cert)) 
{
+  if (! tor_cert_opt_eq(sd->signing_key_cert,
+ei->cache_info.signing_key_cert)) {
 if (msg) *msg = "Extrainfo signing key cert didn't match routerinfo";
 goto err; /* different servers */
   }
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index a7c29aa..91025c1 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1405,7 +1405,8 @@ router_parse_entry_from_string(const char *s, const char 
*end,
 log_warn(LD_DIR, "Couldn't parse ed25519 cert");
 goto err;
   }
-  router->cache_info.signing_key_cert = cert; /* makes sure it gets 
freed.*/
+  /* makes sure it gets freed. */
+  router->cache_info.signing_key_cert = cert;
 
   if (cert->cert_type != CERT_TYPE_ID_SIGNING ||
   ! cert->signing_key_included) {
@@ -1600,8 +1601,8 @@ router_parse_entry_from_string(const char *s, const char 
*end,
 }
 
 if (tok->n_args >= 2) {
-  if (digest256_from_base64(router->cache_info.extra_info_digest256, 
tok->args[1])
-  < 0) {
+  if (digest256_from_base64(router->cache_info.extra_info_digest256,
+tok->args[1]) < 0) {
 log_warn(LD_DIR, "Invalid extra info digest256 %s",
  escaped(tok->args[1]));
   }