[tor-commits] [tor/release-0.2.2] Report wrong key sizes correctly

[arma@xxxxxxxxxxxxxx]

commit 0fd3ad75daf925e8192aa1d44b229b3b7c29829d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jun 1 11:07:08 2011 -0400

    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.
---
 changes/bug3318      |    3 +++
 src/or/routerparse.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/changes/bug3318 b/changes/bug3318
new file mode 100644
index 0000000..38991c4
--- /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 1dcbc6a..3728e99 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 */



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits