diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-03 11:36:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-03 11:36:21 -0400 |
| commit | 12f9c91c06edf09d8acf40b08aece22b77258dbc (patch) | |
| tree | af0ba8d5fe9ed5f420bf1d62ef4ef124725a4861 /src/or/routerparse.c | |
| parent | 50e4c98a5acb6d10203cc943a336abb7715414cf (diff) | |
| parent | 7aa20b20bffcbc4c9b4e3eb1c874616e1cab119f (diff) | |
| download | tor-12f9c91c06edf09d8acf40b08aece22b77258dbc.tar.gz tor-12f9c91c06edf09d8acf40b08aece22b77258dbc.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 79ce2b13c0..b146e5e3c9 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3774,9 +3774,9 @@ token_check_object(memarea_t *area, const char *kwd, break; case NEED_KEY_1024: /* There must be a 1024-bit public key. */ case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ - if (tok->key && crypto_pk_keysize(tok->key) != PK_BYTES) { + if (tok->key && crypto_pk_num_bits(tok->key) != PK_BYTES*8) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", - kwd, (int)crypto_pk_keysize(tok->key)*8); + kwd, crypto_pk_num_bits(tok->key)); RET_ERR(ebuf); } /* fall through */ |