sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r16341@tombo: nickm | 2008-06-15 22:04:25 -0400 

Allow spaces to be omitted in approved-router file fingerprints. Requested by arma.


svn:r15296
This commit is contained in:
Nick Mathewson 2008-06-16 02:08:30 +00:00
parent 9cfe70cb69
commit 44452c2756
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -9,6 +9,8 @@ Changes in version 0.2.1.2-alpha - 2008-??-??
- When building a consensus do not include routers that are down.
This will cut down 30% to 40% on consensus size. Implements
proposal 138.
- In directory authorities' approved-routers files, allow
fingerprints with or without space.
o Bugfixes:
- Asking for a conditional consensus at .../consensus/<fingerprints>

6
doc/TODO
View File

@ -186,13 +186,13 @@ Other things Roger would be excited to see:
Nick
o Send or-dev email about proposal statuses.
- Send or-dev email about window for new proposals, once arma and
o Send or-dev email about window for new proposals, once arma and
nick agree.
- Finish buffer stuff in libevent; start using it in Tor.
- Tors start believing the contents of NETINFO cells.
- Work with Steven and Roger to decide which parts of Paul's project
. Work with Steven and Roger to decide which parts of Paul's project
he wants to work on.
- let approved-routers lines omit spaces in fingerprint.
o let approved-routers lines omit spaces in fingerprint.
Matt
- Fit Vidalia in 640x480 again.

7
src/or/dirserv.c
View File

@ -221,6 +221,7 @@ dirserv_load_fingerprint_file(void)
fingerprint_list_new = authdir_config_new();
for (list=front; list; list=list->next) {
char digest_tmp[DIGEST_LEN];
nickname = list->key; fingerprint = list->value;
if (strlen(nickname) > MAX_NICKNAME_LEN) {
log_notice(LD_CONFIG,
@ -237,8 +238,10 @@ dirserv_load_fingerprint_file(void)
nickname);
continue;
}
if (strlen(fingerprint) != FINGERPRINT_LEN ||
!crypto_pk_check_fingerprint_syntax(fingerprint)) {
tor_strstrip(fingerprint, " "); /* remove spaces */
if (strlen(fingerprint) != HEX_DIGEST_LEN ||
base16_decode(digest_tmp, sizeof(digest_tmp),
fingerprint, HEX_DIGEST_LEN) < 0) {
log_notice(LD_CONFIG,
"Invalid fingerprint (nickname '%s', "
"fingerprint %s). Skipping.",