summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-01 11:08:28 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-01 11:08:28 -0400
commita610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53 (patch)
treee823c5350ebf223a32bc3b0ba98b544993fc6b96 /src/or/routerparse.c
parentd0e7c545bacb45921569bf2236cc49d510530af4 (diff)
parent0fd3ad75daf925e8192aa1d44b229b3b7c29829d (diff)
downloadtor-a610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53.tar.gz
tor-a610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index d8045aefc6..79ce2b13c0 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3776,7 +3776,7 @@ token_check_object(memarea_t *area, const char *kwd,
case NEED_SKEY_1024: /* There must be a 1024-bit private key. */
if (tok->key && crypto_pk_keysize(tok->key) != PK_BYTES) {
tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits",
- kwd, (int)crypto_pk_keysize(tok->key));
+ kwd, (int)crypto_pk_keysize(tok->key)*8);
RET_ERR(ebuf);
}
/* fall through */