diff options
| -rw-r--r-- | src/common/memarea.c | 1 | ||||
| -rw-r--r-- | src/common/memarea.h | 1 | ||||
| -rw-r--r-- | src/or/routerparse.c | 5 | ||||
| -rw-r--r-- | src/or/test.c | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/common/memarea.c b/src/common/memarea.c index c69550b763..916010cfd1 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -209,3 +209,4 @@ memarea_assert_ok(memarea_t *area) tor_assert(chunk->next_mem <= chunk->u.mem+chunk->mem_size+MEMAREA_ALIGN); } } + diff --git a/src/common/memarea.h b/src/common/memarea.h index a13f06bb9a..76a3c3af81 100644 --- a/src/common/memarea.h +++ b/src/common/memarea.h @@ -20,3 +20,4 @@ char *memarea_strndup(memarea_t *area, const char *s, size_t n); void memarea_assert_ok(memarea_t *area); #endif + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 323adbe81c..52c22e5d48 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -121,7 +121,7 @@ typedef struct directory_token_t { directory_keyword tp; /**< Type of the token. */ int n_args:30; /**< Number of elements in args */ char **args; /**< Array of arguments from keyword line. */ - + char *object_type; /**< -----BEGIN [object_type]-----*/ size_t object_size; /**< Bytes in object_body */ char *object_body; /**< Contents of object, base64-decoded. */ @@ -1979,7 +1979,8 @@ networkstatus_v2_parse_from_string(const char *s) memarea_clear(area); while (!strcmpstart(s, "r ")) { routerstatus_t *rs; - if ((rs = routerstatus_parse_entry_from_string(area, &s, tokens, NULL, NULL, 0))) + if ((rs = routerstatus_parse_entry_from_string(area, &s, tokens, + NULL, NULL, 0))) smartlist_add(ns->entries, rs); } smartlist_sort(ns->entries, _compare_routerstatus_entries); diff --git a/src/or/test.c b/src/or/test.c index dfad2f5e1d..851b4573ae 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -619,7 +619,6 @@ test_crypto(void) test_eq(15, crypto_pk_private_decrypt(pk2, data3, data1, 128, PK_PKCS1_OAEP_PADDING,1)); - /* Now try signing. */ strlcpy(data1, "Ossifrage", 1024); test_eq(128, crypto_pk_private_sign(pk1, data2, data1, 10)); |