- tor-commits - lists.torproject.org

[tor/master] Handle crypto_pk_get_digest failures semi-sensibly
by nickm＠torproject.org 05 May '11

05 May '11

commit 66339f74b4affcb02a3160014efe6ce9aca339e1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed May 4 20:06:24 2011 -0700 Handle crypto_pk_get_digest failures semi-sensibly Fixes bug 3106. --- changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/changes/warn-if-get_digest-fails b/changes/warn-if-get_digest-fails new file mode 100644 index 0000000..6cfc108 --- /dev/null +++ b/changes/warn-if-get_digest-fails @@ -0,0 +1,6 @@ + o Minor bugfixes: + - If we fail to compute the identity digest of a v3 legacy + keypair, warn, and don't use a buffer-full of junk instead. + Bugfix on 0.2.1.1-alpha; fixes bug 3106. + + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c8dda66..860ac1f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2705,7 +2705,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, if (options->V3AuthUseLegacyKey) { authority_cert_t *c = get_my_v3_legacy_cert(); if (c) { - crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest); + if (crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest)) { + log_warn(LD_BUG, "Unable to compute digest of legacy v3 identity key"); + memset(voter->legacy_id_digest, 0, DIGEST_LEN); + } } } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9273dbc..db2eaf0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3129,8 +3129,12 @@ dirvote_compute_consensuses(void) authority_cert_t *cert = get_my_v3_legacy_cert(); legacy_sign = get_my_v3_legacy_signing_key(); if (cert) { - crypto_pk_get_digest(cert->identity_key, legacy_dbuf); - legacy_id_digest = legacy_dbuf; + if (crypto_pk_get_digest(cert->identity_key, legacy_dbuf)) { + log_warn(LD_BUG, + "Unable to compute digest of legacy v3 identity key"); + } else { + legacy_id_digest = legacy_dbuf; + } } }

1 0

[tor/master] Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2
by nickm＠torproject.org 05 May '11

05 May '11

commit 9583a534ac8801211b6c171c399f1ea6bb3cce1c Merge: ab1460f 66339f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 23:18:47 2011 -0400 Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2 changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 05 May '11

05 May '11

commit 08efa70c41b258d8655ec01bdb721aea96b42d46 Merge: 7de3a19 9583a53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 23:29:56 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2
by nickm＠torproject.org 05 May '11

05 May '11

commit 9583a534ac8801211b6c171c399f1ea6bb3cce1c Merge: ab1460f 66339f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 23:18:47 2011 -0400 Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2 changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.2] Handle crypto_pk_get_digest failures semi-sensibly
by nickm＠torproject.org 05 May '11

05 May '11

commit 66339f74b4affcb02a3160014efe6ce9aca339e1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed May 4 20:06:24 2011 -0700 Handle crypto_pk_get_digest failures semi-sensibly Fixes bug 3106. --- changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/changes/warn-if-get_digest-fails b/changes/warn-if-get_digest-fails new file mode 100644 index 0000000..6cfc108 --- /dev/null +++ b/changes/warn-if-get_digest-fails @@ -0,0 +1,6 @@ + o Minor bugfixes: + - If we fail to compute the identity digest of a v3 legacy + keypair, warn, and don't use a buffer-full of junk instead. + Bugfix on 0.2.1.1-alpha; fixes bug 3106. + + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c8dda66..860ac1f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2705,7 +2705,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, if (options->V3AuthUseLegacyKey) { authority_cert_t *c = get_my_v3_legacy_cert(); if (c) { - crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest); + if (crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest)) { + log_warn(LD_BUG, "Unable to compute digest of legacy v3 identity key"); + memset(voter->legacy_id_digest, 0, DIGEST_LEN); + } } } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9273dbc..db2eaf0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3129,8 +3129,12 @@ dirvote_compute_consensuses(void) authority_cert_t *cert = get_my_v3_legacy_cert(); legacy_sign = get_my_v3_legacy_signing_key(); if (cert) { - crypto_pk_get_digest(cert->identity_key, legacy_dbuf); - legacy_id_digest = legacy_dbuf; + if (crypto_pk_get_digest(cert->identity_key, legacy_dbuf)) { + log_warn(LD_BUG, + "Unable to compute digest of legacy v3 identity key"); + } else { + legacy_id_digest = legacy_dbuf; + } } }

1 0

[arm/master] fix: Initializing all panels to be hidden
by atagar＠torproject.org 05 May '11

05 May '11

commit a45b4fd97a801d22b2bf66f2809e560523738e63 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 4 19:36:19 2011 -0700 fix: Initializing all panels to be hidden A recent change to pausing functionality caused a timing issue where the log panel would redraw before being properly placed. The result was that the log panle's title flashes at the top of the screen at startup. This starts that panel (and all others) as hidden on init. --- src/cli/controller.py | 2 ++ src/util/panel.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 512e5ba..b8bb5cd 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -651,6 +651,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): lastSize = None # sets initial visiblity for the pages + for entry in PAGE_S: panels[entry].setVisible(True) + for i in range(len(PAGES)): isVisible = i == page for entry in PAGES[i]: panels[entry].setVisible(isVisible) diff --git a/src/util/panel.py b/src/util/panel.py index 4f8763c..9c3dd29 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -60,7 +60,7 @@ class Panel(): self.panelName = name self.parent = parent - self.visible = True + self.visible = False # Attributes for pausing. The pauseAttr contains variables our getAttr # method is tracking, and the pause buffer has copies of the values from

1 0

[arm/master] fix: Don't revert quit confirmation if 'yes'
by atagar＠torproject.org 05 May '11

05 May '11

commit 45adb1c8036ef0b89eb58606fc2c559b38c82a27 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 4 19:10:56 2011 -0700 fix: Don't revert quit confirmation if 'yes' Due to changes in pause functionality the message when confirming that you want to quit would be reverted, even when you answer 'yes' to shut arm down (just a brief flicker while quitting). --- src/cli/controller.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 91c34df..512e5ba 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -808,7 +808,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): quitConfirmed = confirmationKey in (ord('q'), ord('Q')) curses.halfdelay(REFRESH_RATE * 10) - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) + if not quitConfirmed: + panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release()

1 0

[arm/master] fix: Help dialog inaccurate for config/torrc pages
by atagar＠torproject.org 05 May '11

05 May '11

commit 3461c620e5fd16aea0fc40b9041cddc038718a8c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 4 09:46:46 2011 -0700 fix: Help dialog inaccurate for config/torrc pages Somehow while shuffling the pages the config page's help options were dropped and the torrc's was assigned to another page. Reassigned pages and filled in missing options. --- src/cli/controller.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 08d7b17..91c34df 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -969,6 +969,15 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): popup.addfstr(1, 41, "down arrow: scroll down a line") popup.addfstr(2, 2, "page up: scroll up a page") popup.addfstr(2, 41, "page down: scroll down a page") + popup.addfstr(3, 2, "enter: edit configuration option") + popup.addfstr(3, 41, "w: save configuration") + popup.addfstr(4, 2, "a: toggle option filtering") + popup.addfstr(4, 41, "s: sort ordering") + elif page == 3: + popup.addfstr(1, 2, "up arrow: scroll up a line") + popup.addfstr(1, 41, "down arrow: scroll down a line") + popup.addfstr(2, 2, "page up: scroll up a page") + popup.addfstr(2, 41, "page down: scroll down a page") strippingLabel = "on" if panels["torrc"].stripComments else "off" popup.addfstr(3, 2, "s: comment stripping (%s)" % strippingLabel) @@ -978,12 +987,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): popup.addfstr(4, 2, "r: reload torrc") popup.addfstr(4, 41, "x: reset tor (issue sighup)") - elif page == 3: - popup.addfstr(1, 2, "up arrow: scroll up a line") - popup.addfstr(1, 41, "down arrow: scroll down a line") - popup.addfstr(2, 2, "page up: scroll up a page") - popup.addfstr(2, 41, "page down: scroll down a page") - popup.addfstr(3, 2, "enter: connection details") popup.addstr(7, 2, "Press any key...") popup.refresh()

1 0

[arm/master] fix: Making sure to load msg.* options on startup
by atagar＠torproject.org 05 May '11

05 May '11

commit de2e1b7a44543440aba5260ca4268aa8419c7de8 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 4 19:19:41 2011 -0700 fix: Making sure to load msg.* options on startup The msg.* config options wouldn't be loaded before warning of unused config options if we didn't deduplicate a log at startup. Also loading on panel creation to be sure it's done before issuing the warning. --- src/cli/logPanel.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 7c1c19a..6feb129 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -530,6 +530,11 @@ class LogPanel(panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) + # Make sure that the msg.* messages are loaded. Lazy loading it later is + # fine, but this way we're sure it happens before warning about unused + # config options. + loadLogMessages() + self._config = dict(DEFAULT_CONFIG) if config:

1 0

[tor/master] Fix compile warning on windows
by nickm＠torproject.org 05 May '11

05 May '11

commit 9a490bb53b98efa4cec721a80fe5fec94c554c1f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 5 02:21:09 2011 +0200 Fix compile warning on windows --- src/or/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 462b51e..7bae59c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1587,6 +1587,7 @@ do_main_loop(void) } } +#ifndef MS_WINDOWS /* Only called when we're willing to use signals */ /** Libevent callback: invoked when we get a signal. */ static void @@ -1598,6 +1599,7 @@ signal_callback(int fd, short events, void *arg) process_signal(sig); } +#endif /** Do the work of acting on a signal received in sig */ void

1 0