summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-01 11:07:08 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-01 11:07:17 -0400
commit0fd3ad75daf925e8192aa1d44b229b3b7c29829d (patch)
tree44eb4c18f6827bbb27abf6addba09544b2c55f51
parent56771f392e68eb2f78180daab0d8f17c9284ad11 (diff)
downloadtor-0fd3ad75daf925e8192aa1d44b229b3b7c29829d.tar.gz
tor-0fd3ad75daf925e8192aa1d44b229b3b7c29829d.zip
Report wrong key sizes correctly
When we introduced NEED_KEY_1024 in routerparse.c back in 0.2.0.1-alpha, I forgot to add a *8 when logging the length of a bad-length key. Bugfix for 3318 on 0.2.0.1-alpha.
-rw-r--r--changes/bug33183
-rw-r--r--src/or/routerparse.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug3318 b/changes/bug3318
new file mode 100644
index 0000000000..38991c4b1d
--- /dev/null
+++ b/changes/bug3318
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - Fix a log message that said "bits" while displaying a value in
+ bytes. Fixes bug 3318; bugfix on 0.2.0.1-alpha.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 1dcbc6a184..3728e9932b 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3767,7 +3767,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 */