Appease make check-spaces

diff --git a/src/common/aes.c b/src/common/aes.c
index dbc12dcd23aa65e1116fb835088b461a4a50a9ae..8b9d81fa10bf6594711a9c17ff074c3067683aa9 100644 (file)
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -501,3 +501,4 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv)
 }
 
 #endif
+

diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h
index 8ffb9f26f3953ceaf3b58d01469099a2ba67096d..4d20406d06915db2f4bb87e1bbbba86d068e3158 100644 (file)
--- a/src/common/crypto_ed25519.h
+++ b/src/common/crypto_ed25519.h
@@ -88,7 +88,6 @@ int ed25519_public_blind(ed25519_public_key_t *out,
                          const ed25519_public_key_t *inp,
                          const uint8_t *param);
 
-
 /* XXXX move these to crypto_format.h */
 #define ED25519_BASE64_LEN 43
 int ed25519_public_from_base64(ed25519_public_key_t *pkey,

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 098df9db6cc16d27effef0f7277b7466d97b66c2..a4b6c487fe289ae6e204e486aff84287ea56cdd6 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1810,7 +1810,8 @@ rectify_client_ciphers(SSL *ssl)
                   SSL_CIPHER_get_name(cipher));
         ++j;
       } else if (cipher &&
-                 (SSL_CIPHER_get_id(cipher) & 0xffff) == CLIENT_CIPHER_INFO_LIST[i].id) {
+                 (SSL_CIPHER_get_id(cipher) & 0xffff) ==
+                  CLIENT_CIPHER_INFO_LIST[i].id) {
         /* "cipher" is the cipher we expect. Put it on the list. */
         log_debug(LD_NET, "Found cipher %s", SSL_CIPHER_get_name(cipher));
         sk_SSL_CIPHER_push(CLIENT_CIPHER_STACK, cipher);

diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index ecf02182fc303d85873a2ecdf54635095c47aa26..c90f569233368c672b145df6addf36c8919f9b76 100644 (file)
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -2004,7 +2004,7 @@ channel_tls_process_auth_challenge_cell(var_cell_t *cell, channel_tls_t *chan)
     goto done;
   }
 
-done:
+ done:
   auth_challenge_cell_free(ac);
 
 #undef ERR

diff --git a/src/or/control.c b/src/or/control.c
index 746dfff9219e91ea706d16764fba7707610fa618..2eaad4e373a661e3cf7d35b59152b843dc41cdcd 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -6029,7 +6029,7 @@ get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp)
     } SMARTLIST_FOREACH_END(fingerprint);
   }
 
-end:
+ end:
   return desc_id;
 }
 

diff --git a/src/or/dircollate.c b/src/or/dircollate.c
index 20dfb357a8dc743a1de7ab5bbd0bda2ff75f261b..34259ecf97647badf4b820380ad8e86599a33975 100644 (file)
--- a/src/or/dircollate.c
+++ b/src/or/dircollate.c
@@ -59,8 +59,10 @@ ddmap_entry_set_digests(ddmap_entry_t *ent,
   memcpy(ent->d + DIGEST_LEN, ed25519, DIGEST256_LEN);
 }
 
-HT_PROTOTYPE(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash, ddmap_entry_eq);
-HT_GENERATE2(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash, ddmap_entry_eq, 0.6, tor_reallocarray, tor_free_);
+HT_PROTOTYPE(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash,
+             ddmap_entry_eq);
+HT_GENERATE2(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash,
+             ddmap_entry_eq, 0.6, tor_reallocarray, tor_free_);
 static void
 dircollator_add_routerstatus(dircollator_t *dc,
                              int vote_num,

diff --git a/src/or/dircollate.h b/src/or/dircollate.h
index 9eba37a0104e9351e2e52191ced05dbb09d172a8..cd1e8ac96d89ad1cc93bbce6dbc82a30f3feb5b7 100644 (file)
--- a/src/or/dircollate.h
+++ b/src/or/dircollate.h
@@ -47,3 +47,4 @@ struct dircollator_s {
 #endif
 
 #endif
+

diff --git a/src/or/or.h b/src/or/or.h
index 81e1c1c1db77a86ef30020b18077b6a6d64996a8..ec5f2774baa89fcdde6b1ca6b4b5af93a73fe44b 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4281,7 +4281,6 @@ typedef struct {
    * XXXX Eventually, the default will be 0. */
   int ExitRelay;
 
-
   /** For how long (seconds) do we declare our singning keys to be valid? */
   int SigningKeyLifetime;
   /** For how long (seconds) do we declare our link keys to be valid? */

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d27b06d5dfc92a3fddfec292c689bfdbdb8169b3..c857d4cc8710135498aaf9e3ac5b4a78367de963 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -581,7 +581,8 @@ rend_config_services(const or_options_t *options, int validate_only)
                                                         10, 0, 1, &ok, NULL);
       if (!ok) {
         log_warn(LD_CONFIG,
-                 "HiddenServiceMaxStreamsCloseCircuit should be 0 or 1, not %s",
+                 "HiddenServiceMaxStreamsCloseCircuit should be 0 or 1, "
+                 "not %s",
                  line->value);
         rend_service_free(service);
         return -1;

diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index a76bf99b3a2c378ab368f3e97051c1d265396ae0..8b1ade599c7a7efbf852e3333c6007d18cfbe238 100644 (file)
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -312,7 +312,8 @@ load_ed_keys(const or_options_t *options, time_t now)
     check_signing_cert = signing_key_cert;
     use_signing = master_signing_key;
   } else {
-    char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing");
+    char *fname =
+      options_get_datadir_fname2(options, "keys", "ed25519_signing");
     sign = ed_key_init_from_file(
                fname,
                INIT_ED_KEY_NEEDCERT|
@@ -340,7 +341,8 @@ load_ed_keys(const or_options_t *options, time_t now)
     if (! want_new_signing_key)
       flags |= INIT_ED_KEY_OMIT_SECRET;
 
-    char *fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id");
+    char *fname =
+      options_get_datadir_fname2(options, "keys", "ed25519_master_id");
     id = ed_key_init_from_file(
              fname,
              flags,
@@ -363,7 +365,8 @@ load_ed_keys(const or_options_t *options, time_t now)
                       INIT_ED_KEY_EXTRA_STRONG|
                       INIT_ED_KEY_NEEDCERT|
                       INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT);
-    char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing");
+    char *fname =
+      options_get_datadir_fname2(options, "keys", "ed25519_signing");
     sign = ed_key_init_from_file(fname,
                                  flags, LOG_WARN,
                                  sign_signing_key_with_id, now,

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7eba13a544b7547b3a9879c792e6fd4be64bee4f..35021964a2decd7cb84dd65a66ed5df0c4fe5bb4 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4921,7 +4921,8 @@ routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri,
    * digest256 was in the ri. */
   digest256_matches = tor_memeq(ei->digest256,
                                 ri->extra_info_digest256, DIGEST256_LEN);
-  digest256_matches |= tor_mem_is_zero(ri->extra_info_digest256, DIGEST256_LEN);
+  digest256_matches |=
+    tor_mem_is_zero(ri->extra_info_digest256, DIGEST256_LEN);
 
   /* The identity must match exactly to have been generated at the same time
    * by the same router. */

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 1835bf8194f4bd48e5e42fa751fefac84ba980e2..1413d40703b2de3dc99af39e3034c58bee0be632 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2352,7 +2352,8 @@ routerstatus_parse_entry_from_string(memarea_t *area,
         if (!strcmp(t->args[0], "ed25519")) {
           vote_rs->has_ed25519_listing = 1;
           if (strcmp(t->args[1], "none") &&
-              digest256_from_base64((char*)vote_rs->ed25519_id, t->args[1])<0) {
+              digest256_from_base64((char*)vote_rs->ed25519_id,
+                                    t->args[1])<0) {
             log_warn(LD_DIR, "Bogus ed25519 key in networkstatus vote");
             goto err;
           }
@@ -3184,7 +3185,8 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
   }
   if (ns_type != NS_TYPE_CONSENSUS) {
     digest256map_t *ed_id_map = digest256map_new();
-    SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, vote_routerstatus_t *, vrs) {
+    SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, vote_routerstatus_t *,
+                            vrs) {
       if (! vrs->has_ed25519_listing ||
           tor_mem_is_zero((const char *)vrs->ed25519_id, DIGEST256_LEN))
         continue;

diff --git a/src/or/torcert.c b/src/or/torcert.c
index 838501ea49473b6a6267f3dc7cab1b079e1f8864..f028910a70593bcaa277ca93cc95d01903dfaa3e 100644 (file)
--- a/src/or/torcert.c
+++ b/src/or/torcert.c
@@ -282,3 +282,4 @@ tor_make_rsa_ed25519_crosscert(const ed25519_public_key_t *ed_key,
   *cert = res;
   return sz;
 }
+

diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c
index 22ee6aa8e31f7c537aa63d5dc449685453b259dc..e8fce123147672bb878688ee335ae829ebdb54d3 100644 (file)
--- a/src/test/test_buffers.c
+++ b/src/test/test_buffers.c
@@ -744,7 +744,6 @@ test_buffers_tls_read_mocked(void *arg)
   next_reply_val[1] = 5000;
   tt_int_op(6000, ==, read_to_buf_tls(NULL, 6000, buf));
 
-
  done:
   UNMOCK(tor_tls_read);
   tor_free(mem);

diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index fc265bcabcd877b0eaf72e99633289ed4fa76735..6d01798a63a89302df8879792efd367c6c5edf89 100644 (file)
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -210,8 +210,9 @@ test_hs_desc_event(void *arg)
 
   /* test valid content. */
   char *exp_msg;
-  control_event_hs_descriptor_content(rend_query.onion_address, STR_HS_CONTENT_DESC_ID,
-                                      HSDIR_EXIST_ID, hs_desc_content);
+  control_event_hs_descriptor_content(rend_query.onion_address,
+                                      STR_HS_CONTENT_DESC_ID, HSDIR_EXIST_ID,
+                                      hs_desc_content);
   tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " "\
                STR_HS_CONTENT_DESC_ID " " STR_HSDIR_EXIST_LONGNAME\
                "\r\n%s\r\n.\r\n650 OK\r\n", hs_desc_content);

diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index b3b65319aa672c62326f199c6d8904e24f50db8b..0b3900e461b69cc1a4a1250e86e9ed9b82ef90a4 100644 (file)
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -197,7 +197,6 @@ typedef struct certs_data_s {
   crypto_pk_t *key1, *key2;
 } certs_data_t;
 
-
 static int
 recv_certs_cleanup(const struct testcase_t *test, void *obj)
 {
@@ -593,7 +592,6 @@ AUTHCHALLENGE_FAIL(truncated,
 AUTHCHALLENGE_FAIL(nonzero_circid,
                    d->cell->circ_id = 1337)
 
-
 static tor_x509_cert_t *mock_peer_cert = NULL;
 static tor_x509_cert_t *
 mock_get_peer_cert(tor_tls_t *tls)
@@ -914,3 +912,4 @@ struct testcase_t link_handshake_tests[] = {
 
   END_OF_TESTCASES
 };
+