aboutsummaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2019-05-15 23:20:03 -0400
committerRoger Dingledine <arma@torproject.org>2019-05-15 23:20:03 -0400
commitd86896b29c7a5278bedd89a7150ddbe7531b365b (patch)
treecafa3cb9891674251080b5877f711a0e98a42b51 /src/feature
parent338cfb31798267dc8260415ef55ddceb042367bd (diff)
downloadtor-d86896b29c7a5278bedd89a7150ddbe7531b365b.tar.gz
tor-d86896b29c7a5278bedd89a7150ddbe7531b365b.zip
fix typos, whitespace, comments
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/dirauth/shared_random_state.c2
-rw-r--r--src/feature/hs/hs_client.c2
-rw-r--r--src/feature/hs/hs_common.c6
-rw-r--r--src/feature/hs/hs_service.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
index 9a045b283d..b669e3836e 100644
--- a/src/feature/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
@@ -937,7 +937,7 @@ state_query_del_all_(sr_state_object_t obj_type)
} DIGESTMAP_FOREACH_END;
break;
}
- /* The following object are _NOT_ suppose to be removed. */
+ /* The following objects are _NOT_ supposed to be removed. */
case SR_STATE_OBJ_CURSRV:
case SR_STATE_OBJ_PREVSRV:
case SR_STATE_OBJ_PHASE:
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index 7aec6d80bb..ad5bf15563 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -697,7 +697,7 @@ setup_intro_circ_auth_key(origin_circuit_t *circ)
}
/* Reaching this point means we didn't find any intro point for this circuit
- * which is not suppose to happen. */
+ * which is not supposed to happen. */
tor_assert_nonfatal_unreached();
end:
diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c
index 597409a1e9..a5747fe170 100644
--- a/src/feature/hs/hs_common.c
+++ b/src/feature/hs/hs_common.c
@@ -941,7 +941,7 @@ hs_parse_address(const char *address, ed25519_public_key_t *key_out,
return -1;
}
-/* Validate a given onion address. The length, the base32 decoding and
+/* Validate a given onion address. The length, the base32 decoding, and
* checksum are validated. Return 1 if valid else 0. */
int
hs_address_is_valid(const char *address)
@@ -956,7 +956,7 @@ hs_address_is_valid(const char *address)
goto invalid;
}
- /* Get the checksum it's suppose to be and compare it with what we have
+ /* Get the checksum it's supposed to be and compare it with what we have
* encoded in the address. */
build_hs_checksum(&service_pubkey, version, target_checksum);
if (tor_memcmp(checksum, target_checksum, sizeof(checksum))) {
@@ -984,7 +984,7 @@ hs_address_is_valid(const char *address)
* The returned address is base32 encoded and put in addr_out. The caller MUST
* make sure the addr_out is at least HS_SERVICE_ADDR_LEN_BASE32 + 1 long.
*
- * Format is as follow:
+ * Format is as follows:
* base32(PUBKEY || CHECKSUM || VERSION)
* CHECKSUM = H(".onion checksum" || PUBKEY || VERSION)
* */
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 76e55e4f83..8a4f1efb16 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -1231,7 +1231,7 @@ load_client_keys(hs_service_t *service)
client_key_str = read_file_to_str(client_key_file_path, 0, NULL);
/* If we cannot read the file, continue with the next file. */
- if (!client_key_str) {
+ if (!client_key_str) {
log_warn(LD_REND, "Client authorization file %s can't be read. "
"Corrupted or verify permission? Ignoring.",
client_key_file_path);