summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-04 14:00:08 -0400
committerNick Mathewson <nickm@torproject.org>2016-11-04 14:00:08 -0400
commit6847b9f6af1db75e44c7249b04820bf82f00a887 (patch)
treee16d3cb983d29ec1be227fda3dfb5acd1e34c70b /src/or
parent0e2df2b653ea25d3191995829e64c512c4868f2c (diff)
downloadtor-6847b9f6af1db75e44c7249b04820bf82f00a887.tar.gz
tor-6847b9f6af1db75e44c7249b04820bf82f00a887.zip
Fix make check-spaces
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuitlist.h2
-rw-r--r--src/or/circuituse.c2
-rw-r--r--src/or/hs_cache.c1
-rw-r--r--src/or/hs_common.c1
-rw-r--r--src/or/hs_descriptor.c3
-rw-r--r--src/or/rendcommon.c1
6 files changed, 6 insertions, 4 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index 2e9ce896cc..989c02afd5 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -45,7 +45,7 @@ origin_circuit_t *circuit_get_by_global_id(uint32_t id);
origin_circuit_t *circuit_get_ready_rend_circ_by_rend_data(
const rend_data_t *rend_data);
origin_circuit_t *circuit_get_next_by_pk_and_purpose(origin_circuit_t *start,
- const uint8_t *digest, uint8_t purpose);
+ const uint8_t *digest, uint8_t purpose);
or_circuit_t *circuit_get_rendezvous(const uint8_t *cookie);
or_circuit_t *circuit_get_intro_point(const uint8_t *digest);
void circuit_set_rendezvous_cookie(or_circuit_t *circ, const uint8_t *cookie);
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 1adb6fc887..71615bc17a 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -174,7 +174,7 @@ circuit_is_acceptable(const origin_circuit_t *origin_circ,
(!edge_conn->rend_data && origin_circ->rend_data) ||
(edge_conn->rend_data && origin_circ->rend_data &&
rend_cmp_service_ids(rend_data_get_address(edge_conn->rend_data),
- rend_data_get_address(origin_circ->rend_data)))) {
+ rend_data_get_address(origin_circ->rend_data)))) {
/* this circ is not for this conn */
return 0;
}
diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c
index fe86e04694..b5369c0974 100644
--- a/src/or/hs_cache.c
+++ b/src/or/hs_cache.c
@@ -382,3 +382,4 @@ hs_cache_free_all(void)
digest256map_free(hs_cache_v3_dir, cache_dir_desc_free_);
hs_cache_v3_dir = NULL;
}
+
diff --git a/src/or/hs_common.c b/src/or/hs_common.c
index 448bf5b800..b7ee888842 100644
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@ -278,3 +278,4 @@ hs_v3_protocol_is_enabled(void)
* it's enabled if the parameter is not found. */
return networkstatus_get_param(NULL, "EnableOnionServicesV3", 1, 0, 1);
}
+
diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c
index f5dafabcdf..0676c71737 100644
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@ -314,7 +314,8 @@ encode_enc_key(const ed25519_keypair_t *sig_key,
&ip->enc_key.curve25519)) {
goto err;
}
- tor_cert_t *cross_cert = tor_cert_create(&curve_kp, CERT_TYPE_CROSS_HS_IP_KEYS,
+ tor_cert_t *cross_cert = tor_cert_create(&curve_kp,
+ CERT_TYPE_CROSS_HS_IP_KEYS,
&sig_key->pubkey, now,
HS_DESC_CERT_LIFETIME,
CERT_FLAG_INCLUDE_SIGNING_KEY);
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 1e5d1ab121..f2060e528c 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1028,4 +1028,3 @@ rend_circuit_pk_digest_eq(const origin_circuit_t *ocirc,
return 1;
}
-