April 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Rewrite options.html template.
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit e98a4319f3024f7d8bc7621d415562df641ab566 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:51:55 2014 +0000 Rewrite options.html template. --- lib/bridgedb/templates/options.html | 198 +++++++++++++++++++++++++++++------ 1 file changed, 164 insertions(+), 34 deletions(-) diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html index 82d1213..d786ac1 100644 --- a/lib/bridgedb/templates/options.html +++ b/lib/bridgedb/templates/options.html @@ -1,39 +1,169 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*- <%inherit file="base.html"/> -<br /> -<br /> -<p><h2><a href="bridges">${_("""Just Give Me Bridges!""")}</a></h2> -</p> -<br /><br /><br /> -<hr /> -<p> -<h3> ${_("""Advanced Options""")}</h3> -<form action="bridges" method="GET"> -<div style="float: left;"> -<p>${_("""Do you need IPv6 addresses?""")} -</p> -## TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses" -<input type="checkbox" name="ipv6" value="yes">${_("""Yes!""")}</input> -<br /> -<br /> -</div><div style="float: right;"> -<p>${_("""Do you need a specific pluggable transport?""")}</p> -<select name="transport"> -<option name="none" value="0"> -## TRANSLATORS: Please do not translate the pluggable transport names -## (obfs2, obfs3, etc) - ${_("""No""")} -</option> -<option value="obfs2">${_("""Yes, obfs2""")}</option> -<option value="obfs3">${_("""Yes, obfs3""")}</option> - -</select> +<div class="container-fluid" + style="width: 96%; align: center; margin: 2%"> + <div class="container-fluid" style="padding: 2%"> + <p> + <h2>${_("""Get Bridges!""")}</h2> + </p> + </div> + <div class="container-fluid" + style="width: 100%; align: center; padding: 2%;"> + <p> + ${_(" BridgeDB can provide bridges with several %s types of %s, which can" + " help obfuscate your connections to the Tor Network, making it more" + " difficult for anyone watching your internet traffic to determine" + " that you are using Tor.") % \ + ("""<a href="https://www.torproject.org/docs/pluggable-transports.html">""", + """Pluggable Transports</a>""")} + </p> + <p> + ${_("Some bridges with IPv6 addresses are also available, though some" + " %s aren't IPv6 compatible.") % \ + ("""Pluggable Transports""")} + </p> + <p> + ${_(" Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s" + " without any %s %s which maybe doesn't sound as cool, but they can" + " still help to circumvent internet censorship in many cases.") % \ + ("""&#8212""", """Pluggable Transports""", """&#8212""")} + + </p> + <div class="container-fluid" style="align: center: margin: 2%;"> + <div style="align: center; padding: 5%;"> + <p class="bs-component"> + <a href="./bridges"> + <button class="btn btn-success btn-lg btn-block" + type="button" + accesskey="j"> +  + ${_("""%sJ%sust give me bridges!""") % ("""<u>""", """</u>""")} + </button> + </a> + </p> + </div> + </div> + </div> +</div> + + +<div class="container-fluid" + style="width: 96%; align: center; margin-left: 2%; margin-right: 2%;"> + <div class="panel panel-primary"> + <div class="panel-heading"> + <h3 class="panel-title">${_("""Advanced Options""")}</h3> + </div> + +  + <form class="form-horizontal" id="advancedOptions" action="bridges" method="GET"> + <fieldset> + <div class="container-fluid" id="instructions" style="align-content: left;"> + <legend style="font-size: 112%"> + <br /> + <p>${_("""Please select options for bridge type:""")}</p> + </legend> + </div> + + <div class="container-fluid"> +  + <div class="row" style="width: 98%; height: inherit; margin: auto;"> + +  + <div class="container-fluid col-lg-2" + style="float: left; width: 50%; height: inherit;"> + <div class="step" style="height: inherit;"> + <div class="form-group"> + <label class="control-label" + for="transport" + style="text-align: inherit;"> + ${_("""Do you need a %s?""") % ("""Pluggable <u>T</u>ransport""")} + </label> + <div class="container-fluid col-lg-4"> + <div class="btn-group" style="float: left; padding: 2%;"> + <select class="btn btn-primary btn-sm dropdown" + form="advancedOptions" + id="transport" + name="transport" + data-toggle="dropdown" + type="button" + accesskey="t"> + ${_("""No""")} +<option label="none" value="0" >${_("none")}</option> + +<option label="obfs2" value="obfs2" >obfs2</option> +<option label="obfs3" value="obfs3" selected >obfs3</option> +<option label="scramblesuit" value="scramblesuit">scramblesuit</option> + +<option label="fte" value="fte" disabled >fteproxy</option> +<option label="meek" value="meek" disabled >meek</option> + </select> + </div> + </div> + </div> + </div> + </div>  + +  + <div class="container-fluid col-lg-2" + style="float: right; width: 50%; height: inherit;"> + <div class="step" + style="height: inherit; margin-right: 1%;"> + <div class="form-group"> + <label class="control-label" + for="ipv6" + style="text-align: inherit;"> + ${_("""Do you need IPv6 addresses?""")} + </label> + <div class="container-fluid col-lg-4"> + <div class="checkbox" + style="float: left;"> + <div class="input-group" + style="float: left; padding: 2%;"> + <input name="ipv6" + id="ipv6" + form="advancedOptions" + type="checkbox" + value="yes" + accesskey="y" /> +  + ${_("""%sY%ses!""") % ("""<u>""", """</u>""")} + </div> + </div> + </div> + </div> + </div> + </div>  + </div> + + </div>  + </fieldset> + +  + <div class="row" + style="width: 98%; height: inherit; + margin-left: auto; margin-right: auto; padding: 2%;"> + <div class="container-fluid col-lg-2" + style="width: 50%; text-align: center;"> + <p> + <button class="btn btn-primary btn-lg btn-block" + accesskey="g"> + ${_("""%sG%set Bridges""") % ("""<u>""", """</u>""")} + </button> + </p> + </div> + </div> + </form>  + </div>  </div> <br /> -<br /> -<br /> -<br /> -<p><button>${_("""Get Bridges""")}</button></p> -</form> <hr>

1 0

[bridgedb/develop] Add accesskey to "get bridges" link.
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit 2b75894680405f55342e09cb3944e4fda9fad608 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:51:04 2014 +0000 Add accesskey to "get bridges" link. --- lib/bridgedb/templates/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 1f5ab34..da48ddd 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -20,9 +20,9 @@ <div class="bdb_span7 step-text"> <span class="lead"> <span class="step-title"> - ${_("Step 2")}</span> - <span style="margin-left: 20px;"> - ${_("Get %s bridges %s") % ("""<a href="/options">""", "</a>")}</span> + ${_("Step %s2%s") % ("""<u>""", """</u>""")}</span> + <span style="margin-left: 20px; margin-right: 20px;"> + ${_("Get %s bridges %s") % ("""<a href="/options" accesskey="2">""", "</a>")}</span> </span> </div> </div>

1 0

[bridgedb/develop] Add explanation text for using bridges with TBB.
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit 72fd54d4ab66008fe4bb1980f82bf921832a7a15 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 12:14:34 2014 +0000 Add explanation text for using bridges with TBB. * REMOVES all mention of Vidalia. * FIXES #10803 --- lib/bridgedb/HTTPServer.py | 26 +++++++++++++++++++ lib/bridgedb/templates/bridges.html | 2 +- lib/bridgedb/templates/howto.html | 47 +++++++++++++++++++++++++++++++++++ lib/bridgedb/templates/index.html | 14 ++++++----- 4 files changed, 82 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 7a127d9..5e3ba37 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -553,6 +553,31 @@ class WebResourceOptions(resource.Resource): render_POST = render_GET +class WebResourceHowto(resource.Resource): + """A resource which explains how to use bridges.""" + + isLeaf = True + + def __init__(self): + """Create a new WebResource for the Options page""" + gettext.install("bridgedb", unicode=True) + resource.Resource.__init__(self) + + def render_GET(self, request): + rtl = False + langs = translations.getLocaleFromHTTPRequest(request) + + try: + rtl = translations.usingRTLLang(langs) + except Exception as err: # pragma: no cover + logging.exception(err) + + request.setHeader("Content-Type", "text/html; charset=utf-8") + return lookup.get_template('howto.html').render(rtl=rtl) + + render_POST = render_GET + + class WebResourceBridges(resource.Resource): """This resource displays bridge lines in response to a request.""" @@ -801,6 +826,7 @@ def addWebServer(cfg, dist, sched): httpdist.putChild('assets', static.File(os.path.join(template_root, 'assets/'))) httpdist.putChild('options', WebResourceOptions()) + httpdist.putChild('howto', WebResourceHowto()) bridgesResource = WebResourceBridges( dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 4c57c91..f8e5a0e 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -32,7 +32,7 @@ ${answer} <div class="container-fluid" id="howto" style="align-content: left;"> <p> -${_("""To use the above lines, follow the instructions on the""" \ +${_("""To enter bridges into %s, follow the instructions on the""" \ """ %s %s download page %s to start %s.""") % \ ("""Tor Browser""", """<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" target="_blank">""", diff --git a/lib/bridgedb/templates/howto.html b/lib/bridgedb/templates/howto.html new file mode 100644 index 0000000..42e14ca --- /dev/null +++ b/lib/bridgedb/templates/howto.html @@ -0,0 +1,47 @@ +## -*- coding: utf-8 -*- + +<%inherit file="base.html"/> + +<div class="container-fluid" + style="width: 98%; align: center; margin: auto;"> +<div class="container-fluid" + style="width: 95%; align: center; + padding-top: 10%; padding-left: 5%; padding-right: 5%;"> + <div class="panel panel-primary"> + <div class="panel-heading"> + <h3 class="panel-title">${_("""How to start using your bridges""")}</h3> + </div> + <br /> + + <div class="container-fluid" id="howto" style="align-content: left;"> + <p> +${_("""To enter bridges into %s, follow the instructions on the""" \ + """ %s %s download page %s to start %s.""") % \ + ("""Tor Browser""", + """<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" target="_blank">""", + """Tor Browser""", """</a>""", """Tor Browser""")} +${_("""When the "Tor Network Settings" dialogue pops up,""" \ + """ click "Configure" and follow the wizard until it asks:""")} + </p> + <br /> + <div class="bs-component"> + <blockquote> + <p> +${_(""" Does your Internet Service Provider (ISP) block or""" \ + """ otherwise censor connections to the Tor Network?""")} + </p> + </blockquote> + </div> + <p> +${_(""" Select "Yes" and click "Next" in order to configure your""" \ + """ new bridges. Select "Enter custom bridges", and copy and""" \ + """ paste the bridges lines shown above into the text input""" \ + """ box. Finally, click "Connect", and you should be good""" \ + """ to go! If you experience trouble, try clicking""" \ + """ the "Help" button in the "Tor Network Settings" wizard for""" \ + """ further assistance.""")} + </p> + </div> + </div> +</div> +</div> diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index da48ddd..243ba10 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -31,10 +31,12 @@ <div class="bdb_span7 step-text"> <span class="lead"> <span class="step-title"> - ${_("Step 3")}</span> - <span style="margin-left: 20px;"> - ${_("Now %s add the bridges to Tor %s") % \ - ("""<a href="https://www.torproject.org/docs/bridges#UsingBridges">""", "</a>")}</span> -</span></div> + ${_("Step %s3%s") % ("""<u>""", """</u>""")}</span> + <span style="margin-left: 20px; margin-right: 20px;"> + ${_("""Now %s add the bridges to Tor %s""") % \ + ("""<a href="/howto" + target="_blank" accesskey="3">""", + """</a>""")}</span> + </span> + </div> </div> -

1 0

[bridgedb/develop] Fix unittest failures for test_HTTPServer due to template string changes.
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit 6c5c358ffcee05ae9584aaa01b4a5b0e401a4ea2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 12:44:03 2014 +0000 Fix unittest failures for test_HTTPServer due to template string changes. --- lib/bridgedb/test/test_HTTPServer.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index c7308a3..111adc1 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -267,6 +267,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): """Create a :class:`HTTPServer.WebResourceBridges` and protect it with a :class:`ReCaptchaProtectedResource`. """ + self.timeout = 10.0 # Can't take longer than that, right? # Set up our resources to fake a minimal HTTP(S) server: self.pagename = b'captcha.html' self.root = Resource() @@ -327,7 +328,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): """Check the ``Request`` returned from ``_renderDeferred``.""" self.assertIsInstance(request, DummyRequest) html = b''.join(request.written) - self.assertSubstring('No bridges currently available', html) + self.assertSubstring('Uh oh, spaghettios!', html) d = task.deferLater(reactor, 0, lambda x: x, (True, self.request)) d.addCallback(self.captchaResource._renderDeferred) @@ -534,11 +535,11 @@ class WebResourceBridgesTests(unittest.TestCase): :rtype: list :returns: A list of the bridge lines contained on the **page**. """ - # The bridge lines are contained in a <pre> tag: - soup = BeautifulSoup(page).find('pre') - soup = str(soup).replace('<pre>', '').strip() - soup = str(soup).replace('</pre>', '').strip() - bridges = [b.strip() for b in soup.splitlines()] + # The bridge lines are contained in a <div class='well well-lg'> tag: + soup = BeautifulSoup(page) + well = soup.find('div', {'class': 'well well-lg'}).find('p') + content = well.renderContents().strip() + bridges = [b.strip() for b in content.splitlines()] return bridges def test_render_GET_vanilla(self): @@ -550,7 +551,7 @@ class WebResourceBridgesTests(unittest.TestCase): page = self.bridgesResource.render(request) # The response should explain how to use the bridge lines: - self.assertSubstring("To use the above lines", page) + self.assertTrue("To enter bridges into Tor Browser" in str(page)) for b in self.parseBridgesFromHTMLPage(page): # Check that each bridge line had the expected number of fields: @@ -579,7 +580,7 @@ class WebResourceBridgesTests(unittest.TestCase): page = self.bridgesResource.render(request) self.bridgesResource.useForwardedHeader = False # Reset it - self.assertSubstring("To use the above lines", page) + self.assertSubstring("To enter bridges into", page) def test_render_GET_RTLlang(self): """Test rendering a request for obfs3 bridges in Arabic.""" @@ -593,7 +594,8 @@ class WebResourceBridgesTests(unittest.TestCase): page = self.bridgesResource.render(request) self.assertSubstring("direction: rtl", page) - self.assertSubstring("لاستخدام الأسطر أعلاه", page) + self.assertSubstring( + "إذا لم يعمل تور بنجاح معك، يجب عليك ارسال بريد إلكتروني إلي", page) for bridgeLine in self.parseBridgesFromHTMLPage(page): # Check that each bridge line had the expected number of fields: @@ -631,7 +633,8 @@ class WebResourceBridgesTests(unittest.TestCase): """) #self.assertNotSubstring("html", page) - for bridgeLine in self.parseBridgesFromHTMLPage(page): + bridgeLines = self.parseBridgesFromHTMLPage(page) + for bridgeLine in bridgeLines: bridgeLine = bridgeLine.split(' ') self.assertEqual(len(bridgeLine), 2)

1 0

[bridgedb/develop] Merge branch 'fix/10803-remove-vidalia-update-options' into develop
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit 42e83f5843bf02fe971a7ca74f85eb49f5d50214 Merge: ebf301d 6c5c358 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 14 19:36:40 2014 +0000 Merge branch 'fix/10803-remove-vidalia-update-options' into develop lib/bridgedb/HTTPServer.py | 26 ++ lib/bridgedb/templates/assets/bootstrap.min.css | 9 - .../templates/assets/css/bootstrap.min.css | 7 + lib/bridgedb/templates/assets/css/custom.css | 104 +++++ .../templates/assets/css/font-awesome-ie7.min.css | 384 +++++++++++++++++++ .../templates/assets/css/font-awesome.min.css | 403 ++++++++++++++++++++ lib/bridgedb/templates/assets/css/main.css | 24 ++ lib/bridgedb/templates/assets/custom.css | 104 ----- .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 +++++++++++++++++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 +++++ lib/bridgedb/templates/base.html | 69 ++-- lib/bridgedb/templates/bridges.html | 92 ++++- lib/bridgedb/templates/captcha.html | 79 +++- lib/bridgedb/templates/howto.html | 47 +++ lib/bridgedb/templates/index.html | 33 +- lib/bridgedb/templates/options.html | 198 ++++++++-- lib/bridgedb/test/test_HTTPServer.py | 23 +- setup.py | 8 +- 24 files changed, 1855 insertions(+), 249 deletions(-)

1 0

[bridgedb/develop] PEP8 whitespace fixes for two lines in Dist.EmailBasedDistributor.
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit 2d8ad3ee045db819cdb7ea8ed5adc97a23e94a89 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 9 19:03:32 2014 +0000 PEP8 whitespace fixes for two lines in Dist.EmailBasedDistributor. --- lib/bridgedb/Dist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 38ca36d..5b5a602 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -543,8 +543,8 @@ class EmailBasedDistributor(Distributor): def cleanDatabase(self): with bridgedb.Storage.getDB() as db: try: - db.cleanEmailedBridges(time.time()-MAX_EMAIL_RATE) - db.cleanWarnedEmails(time.time()-MAX_EMAIL_RATE) + db.cleanEmailedBridges(time.time() - MAX_EMAIL_RATE) + db.cleanWarnedEmails(time.time() - MAX_EMAIL_RATE) except: db.rollback() raise

1 0

[bridgedb/develop] Move HTTPServer.rtl_langs → _langs.RTL_LANGS.
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit c17abbc293e1dd0de2d5896b2ad4f96c368d3d5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 9 13:23:24 2014 +0000 Move HTTPServer.rtl_langs → _langs.RTL_LANGS. --- lib/bridgedb/_langs.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/_langs.py b/lib/bridgedb/_langs.py index 149265c..aca8342 100644 --- a/lib/bridgedb/_langs.py +++ b/lib/bridgedb/_langs.py @@ -10,6 +10,8 @@ """_langs.py - Storage for information on installed language support.""" +RTL_LANGS = ('ar', 'he', 'fa', 'gu_IN', 'ku') + def get_langs(): """Return a list of two-letter country codes of translations which were

1 0

[bridgedb/develop] Add BridgeDB's public offline and public online GnuPG keys.
by isis＠torproject.org 14 Apr '14

14 Apr '14

commit ebf301d68c7e598a75298dd417b81422318ec311 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 9 19:31:17 2014 +0000 Add BridgeDB's public offline and public online GnuPG keys. * ADD ascii-armoured keyfiles to templates/static/bridgedb.asc. --- lib/bridgedb/templates/static/bridgedb.asc | 274 ++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) diff --git a/lib/bridgedb/templates/static/bridgedb.asc b/lib/bridgedb/templates/static/bridgedb.asc new file mode 100644 index 0000000..85d6a71 --- /dev/null +++ b/lib/bridgedb/templates/static/bridgedb.asc @@ -0,0 +1,274 @@ +# pub 4096R/8DC43A2848821E32 2013-09-11 [expires: 2014-09-11] +# Key fingerprint = DF81 1109 E17C 8BF1 34B5 EEB6 8DC4 3A28 4882 1E32 +# uid [ full ] BridgeDB <bridges(a)bridges.torproject.org> +# sub 4096R/21B554E95938F4D0 2013-09-11 [expires: 2014-09-11] +# Key fingerprint = 9FE3 9D1A 7438 9223 3B3F 66F2 21B5 54E9 5938 F4D0 +# sub 4096R/E7793047C5B54232 2013-09-11 [expires: 2014-09-11] +# Key fingerprint = CFFB 8469 9048 37E7 8CAE 322C E779 3047 C5B5 4232 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFIv8YABEADRqvfLB4xWj3Fz+HEmUUt/qbJnZhqIjo5WBHaBJOmrzx1c9fLN +aYG36Hgo6A7NygI1oQmFnDinSrZAtrPaT63d1Jg49yZwr/OhMaxHYJElMFHGJ876 +kLZHmQTysquYKDHhv+fH51t7UVaZ9NkP5cI+V3pqck0DW5DwMsVJXNaU317kk9me +mPJUDMb5FM4d2Vtk1N+54bHJgpgmnukNtpJmRyHRbZBqNMln5nWF7vdZ4u5PGPWj +bA0rPZhayeE3FQ0MHiGL12kHAy30pfg54QfPJDQBCywjABetRE+xaM9TcS+R31Pf +2VbLeb+Km7QpHMwOXI5xZLss9BAWm9EBbmXxuqaRBHyi830jjCrK9UYuzzOqKoUV +Mk1BRelZTFnGPWeVTE+Ps+pwJ0Dwx4ghppJBCoArmEbkNliblxR/2wYOOFi/ZVA4 +Zc2ok9T3rBLVg07b7ezFUScGiTnc7ac7hp6r8Qsh09ZbhRr9erK/n194aEvkXTfr +qepwrAE7YeF4YuR206UOFFWDhxWDLbRu0gIWgrevEQu/cvQPrO9uH5fL6Gw/+mNP +Q/NIteejhkDyvyTUKyBu7x+Gls71zT2u/X13eOAJ8IxBkSVRKQ8tRD+oqJkWplOf ++BpaGU+g6u4kT2AzFDxTOupfrYcPvORTAV/V3suys2YQE4x422GASXDivQARAQAB +tClCcmlkZ2VEQiA8YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnPokDJQQT +AQoBDwUCUi/xgEgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODEx +MTA5RTE3QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJp +ZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVF +RUI2OERDNDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qu +b3JnL3BvbGljeS50eHQCGwEFCQHhM4ADCw0JBBUKCQgEFgIBAAIeAQIXgCcYaHR0 +cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL2tleS5hc2MACgkQjcQ6KEiCHjIW +qw//WM8jAeuZaNl+2Cdt8Mbe4TCS4jggy4IfRgVqOiKEdIcMXUrDIUXsfg1tc+Jg +Gk6Ztcw4Mt8HYIEn2MyhuSWOlRoPlLNzN8i8bVBsPHUGKoX0Z1xIahBhkcXVJTJe +cxRHhvXOpUe+vd54fGYBz/7ViXwwZOjCA7e1zsdkhkpjAkWdJgPynH93bXMU8PYA +XlMR4rJDTs2LCvMIw3BKfv3Z5zE1a3vQFE1dKsKj6Q3fBYw0gZuobF5Z7fgbN9L+ +f9H9bz0A9K7z6AH+6/C9kHwsjWa2zI7Ei+jexQX+v9udNeR1GphLorgewe+1X+9z +UsWhBnczSQU/lQFiFuMFgbzFsuwqD8lmDPrO7Ek3b2R0Klv8ge0cA2Y6z7cVZ8Px +BIEJ5Z9FEqhNBsaLvbbCGbeXUnvzue3Gqcv2WJ8aNfDnPV7BBrtgRSTMP+ErEqyq +DTPWdOASZmEgqox62zMFP42U7UrgHrGKO801Z6P50ELYAganCOEDFC8YM/R1l+Sq +ZezRjjNYj0qNUEm2bBNzLDhi7VvMpoxr2D5oIIrm2i+WeankO2hQuPGuRc0rvASb +tOazhVWqRSddVxeFGlIye8J93NLgEzlHaU1yBwsq/y09/uvmpW65+424HaYzdWVq +s3H4GCa7VyxH6GoQJeXxqQbJP3gsNkSeEyuXF7LyuFl6hVSJCOYEEwEKANAFAlJZ +D9AFgwG4FTBIFIAAAAAAFwAodmVyaWZpZWRAdG9ycHJvamVjdC5vcmdERjgxMTEw +OUUxN0M4QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyTxSAAAAAAB4AKGJyaWRn +ZXNAYnJpZGdlcy50b3Jwcm9qZWN0Lm9yZzdCNzg0MzcwMTVFNjNERjQ3QkIxMjcw +QUNCRDk3QUEyNEU4RTQ3MkUqGmh0dHBzOi8vYnJpZGdlcy50b3Jwcm9qZWN0Lm9y +Zy9wb2xpY3kudHh0AAoJEMvZeqJOjkcuVyY//3Gqkvf84Mo3cLcpux1L6F1UqyQ7 +ZwgFAVbrtsR/8HbDD0BUIEoKUbqkqdMhhNeE+yNzlZHLMqgUxveb4sgfYNStMTJ/ +VSlNPTf/T25FShmS6BghWF8qubyKi4cpqyt3zD1INvvTWdRVzRpwxYRBKKWdALl2 +7J5PqvDSvevjx6h6Gc4FoO97WbK5qaQFOc2Nnw2CKCiEiyL3RciMR4IkvAPoxv+E +Wi6uhCD72s4apqkPiSnsdDqWI/MMkxP7ZKwyyAy/8qMsI79DqwEr2dmLs6AOIXgb +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 +klHqPZwzyHw0O+tBuQINBFIv8oEBEAC2f6e8USDR2OzDH9/26PyNFkcVh3dQBPbU +U6MhINUtrtWK1li+TPQ/LGkbKfXKZ6RhLoVt77uxuJ2rGNu6js+G0irtWDAFSAuf +L9bRJwanaNcxKzY4bN/D65iSm27PbQ32GDotsdBpYTGyKzUrXGaZwnS2ulOjSzG4 +IAy9RsYzD2ATIuE7S4HCHkQ1Eo7GbHGZICsbOUJElXN0q2Mq2msiHPFrSKQy3MT7 +ev4PdK22rWcwXzvvd0c+6lFx5oM7jNIctRb5+tfaNyOQ7Fq3zs/bf0Ls56DgcOD3 +8wzzU+1Zc2TeMRwHK+fuwfgx/SLL5QreTZEBbmKRWQqVzWg9lzrZiKo0wnizX3IE +xI9KqFCBCsimwSIHz/u0trS18vCSlE8uYPZMV0Hh7ni8pEODLdfCR9JzB2x20JdC +tyxk+LnEQzpozbZUApbVS5CJNxopsqirP73WfXPnZuAJMdarCXML73l/opiXtnvU +VKHXMVl8Vq2J7j2uW+Z30dYvhn1dKJ/z7QEPIHPQpCaTIquU0AzhYRT+skHKu+7F +7lJBJeampqbXnc9vBNCOvd7pZ38HLBPNKcZKSBup99w2SUhMqoLVoxNT9qZ7FXzu +SC7N5ii3u2ztb96jF3ApDAhh/5MM77aMKmL2OIGmTA2bUBWPFO5SPRXUVL1XXhwA +duMtvdZ4cwARAQABiQWDBBgBCgDTBQJSL/KBSBSAAAAAABcAKHZlcmlmaWVkQHRv +cnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNBMjg0ODgy +MUUzMk8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmdERjgx +MTEwOUUxN0M4QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyKhpodHRwczovL2Jy +aWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAIbAgUJAeEzgAKkCRCNxDoo +SIIeMsHYIAQZAQoAgQUCUi/ygU8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9y +cHJvamVjdC5vcmc5RkUzOUQxQTc0Mzg5MjIzM0IzRjY2RjIyMUI1NTRFOTU5MzhG +NEQwKhpodHRwczovL2JyaWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAAK +CRAhtVTpWTj00Ns/D/kBN79Pz55pOgLe/RNg1Efme95C/MBZ2eyEPeWe9+yAOFuK +XCJ8qlzkscpdTeu9vjYcfZy7RyS6Sx0NO8gJkP1wmNGr8X4zObSk0IAmDSlCcdpp +YVCPD4IdgSiLNqLdL6JjGE0d5J0DpPLvGbj5sc1/QCpuVt3p0rCr0S+PAAjrNmwA +e2yYdFQx2sXAZ0pp7oJJyFRPYlAUE8RYyG/N2kMYAJZVpI+zFgq5iD0uCmzAZyh/ +62mtGMpGXwy1KHS5+NtUGVN5Iqkvlj59xNEPc8jzDs5yvfOOvpelgbhJQ0exbDHK +78NNeDvouTX/4F1ofbmEM4BqwtQ5TvJEvzMP9zszQWQZd2OvkjYMQSrDMn1w8daO +mBvw319kug8U/0k6YoYcg2rE17tN/CJN0Pq4Mqz+79ArVT6jeJgFcFNER2ik9R0F +Mz3BhFSHIZdMQouFQ/cwaldiWB5g+tJ2nvpXI3cHMtNsy/77uvHIrEv1xZhTSmdc +eA8LmfIdfmepeaEyeTEAPcGebyf1cN+CLJMMTGqSwSHZVe3KFV8t7PKUQ/Z/C13z ++YAEEKxOPNlboVF9FECNRlZkYWkWDyejXHklL26KzBE/mDWoeKM0VakbJO0laXlU +13R334u1VRfWNGkNSmyNlzGqzd+y/Dan4f/NDXAW8Ouyhq+Go5Or4ASclztkbznu +D/9mG59d6ZeeT+1u+dYeWNUjAYkIt3B/TMOs0KQjxHgvbogto1jy4MMvSfyygkCq +zDURZslBXw6gZbSHu1XZrfApaX0tphhOmiwztbwOr4aEDKv5MsT9MgkXEEh8BesF +g/3yUnZ34I8laKfWJQqxVI+reKz/aJYCx9gcoY2jJAaMQoSsxjtFU/KAPvkRhgq/ +QobO5BS/DPWn8SqMzLXlrG2UjR/E5mb6aQU5yDEtSrMuIHQk0hnc3OrgoNX8mt/B +uhVirtqmsJmrftcfvAfXFWp0RIzsh9qixYeE4yAUSX5mZ4a0zheq/jVAnL0KJEEn +p2Mw8pkBSmfJS0QpHtMxoaOkZSZO/Ofah751X2Hlr7KVG9ZUdqm8kKtDMJc/JCDz +tJSpzioUBcXcuG31sfUOayYtS3RG385SuxaC1IiY6QVQvVSh90UVtatfv/jiuWmb +ddgM7Eifto5ybTnPFNkQASRiFmz3NyrWbinmjnMfC94JJRJVwgOUree3KahjopLC +r6WiZEknm8SqaipkH7o7xKN7HIe0kvx67YqwTmCH1wK81pQQrbqZPh6xzCys+AXb +5VK8yoVX4duo7cQGYiODGaw0SqNqXFkzsJ0fy00LDfmKF7KVvtF2qSK50kgAe3Fc +tQRxUklWHHz5IEviG8nBETtXERQLhilK4E3BPc9BA+aPm7kCDQRSL/KeARAA0zi0 +eXuTSikT6Ywm+Af/GGJFofqK2+9BKICGeo+b/Hf3Yy8oY6mfQSJIeNf4WCjMJ7Gu +CpA5E2l9HjbtwRQdsxoGdRkne+duREsYqrLlyJQINqXse28rGhX7mtJ1MeuLZmkJ +tlwK3ZI/8CNKW4PonVspt1kEJmS8k0285fK6UxLU7fktpus9xHgIRB7jRR9eoRA1 +MsJXn9xKLV9547hYi6mjb581GA8YVLyndtitXrNYIIrKYD/nm9W5DAKcXnH9q6pk +lBHL7Lk1oqeKBmTwSxg0HjSh5AlFW4+ME8lgyEbbaN8IvuAhTxFc8PobY9XEH07L +T6lHRuzUjpi0IIHnaFHb+wCZuDCSYshGsZfiAH+gH8K65t3jkr9D4KFMTq1G/b4S +KC/IofILYqr0PamGkUH0AP8N2dErtmH6HH0EvFMPfahvqE4InhuhernfPoTGQGFW +Ram1Ps7czMgxOoeB35ZLelTSdB5NFaBd/E07O+6R11wWyw+ks0erWzbkfa/5W5gv +EH9gNWQE4UdIrhoTURbVD6NvBsWpMRnS2fZByMY5exDf4LJmE8LhIa/snzbS8LUh +9KI3qmw5oLn74IfkiEwrcjQwFLKY62WBLRdDR0aUqJtjRVRCzKjEcnVP53KYdaxm +YFaev81Y+sSJYSpqo+T9cv/QdHOE7tQsyaZCecMAEQEAAYkC6QQYAQoA0wUCUi/y +nkgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3QzhC +RjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJpZGdlc0Bicmlk +Z2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNB +Mjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL3BvbGlj +eS50eHQCGwwFCQHhM4AACgkQjcQ6KEiCHjIPZhAAs5l8T2mWL+kG8WbNyjdISe/W +D0zZ5E2vAnCq5DcxZ4rax3GblJWRxo1frRT5xoq21adGs8TC5NG1u/40KYn30aB2 +9YE6ida9yCR2R2EYKgX5sKGTXXOpnbFa9og4gXHrgU0f9vwT0rY7CyaRmjBfBxRX +fCy7i/+dnsuwhMHn0RHJL4yIEdmQk/HFA6Taep6ACl8Wfrebg0TX5zi63v1RbC4e +KBt39p+l46+UzGWGqP7yfLrHpYNMUIGJOgImvOWeHa2QWJWojHjCuXt5oIuER4ib +p0lUO2B56wljoAjYvgPHWLAVIAMaxQMriMalF4Nlmcgj0I4aWcFuKMXZVUuie/Ps +Epj8U2JpIWmGQhzUNN2eUF5WNV/8VPF/WqzcYBBlmGz1lMzRCmQ/Ws1DlJz2i5Pj +L2cOVatJrRH7Iwz4YPHxgtv+T777GfezuqaIq+ZDKlICxFjalg1gHe40hxsUDdH1 +oJrb5Tg6RD7QV//wDxHDi43p4iL57d3V8LLl/dICA03n/c4ilBBfoh0gWTCjw3pb +sgww4Q39lcUmcittWG5/xS1OLD9WVLSQ42rUu3c5hPL35zAOhFZsFJSIPuZ2ip8E +T94oJR/vE4KRRZca7Uy5A0TcPmB4qTMfaCmWjQOyCxPyJKc2ECx+thiHKglL62Ww +qgQ42nQM/debtU+2aTo= +=ieIZ +-----END PGP PUBLIC KEY BLOCK----- + + +# pub 16384R/CBD97AA24E8E472E 2013-10-12 +# Key fingerprint = 7B78 4370 15E6 3DF4 7BB1 270A CBD9 7AA2 4E8E 472E +# uid [ultimate] BridgeDB (Offline ID Key) <bridges(a)bridges.torproject.org> +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +ILUXBkpIDfVSoZD7qWlntai53BDQr5pfMJhv15di4XAhtqv43vAmA57ifd+QJS2U +AfYc4CdX0lk2BZ4jRD8jCZ4Uxw15E3RqhnXsWDRxtD4fwsb2ZFi0DDuPlwBdGgh5 +Rm2Bz9JjSV6gDEuXr/JtAzjSz1Jdh8wPkSofiHGTfxysVhlGlg+YPRziRlzML8A2 +0xY+9mPxEEin5ZQ9wmrDyiiOBvPTbG3O9+Sp5VZDuD4ivW/DHumPWGVSRdjcAQDe +HMXUVGjhBDnj06XNrgJPhODdJeYq0EnGTt15ofZQSswD7TTTRPDOn0Cz/QARAQAB +tDpCcmlkZ2VEQiAoT2ZmbGluZSBJRCBLZXkpIDxicmlkZ2VzQGJyaWRnZXMudG9y +cHJvamVjdC5vcmc+iQkfBBMBCgEJBQJSWQfkSBSAAAAAABcAKHZlcmlmaWVkQHRv +cnByb2plY3Qub3JnN0I3ODQzNzAxNUU2M0RGNDdCQjEyNzBBQ0JEOTdBQTI0RThF +NDcyRU8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmc3Qjc4 +NDM3MDE1RTYzREY0N0JCMTI3MEFDQkQ5N0FBMjRFOEU0NzJFKhpodHRwczovL2Jy +aWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAIbAQMLDQkEFQoJCAQWAgEA +Ah4BAheAJxhodHRwczovL2JyaWRnZXMudG9ycHJvamVjdC5vcmcva2V5LmFzYwAK +CRDL2XqiTo5HLoqEP/48rFpJCVStn8xo+KkHSVvsqpxDRlb/nNheI+ov2UxILdwl +NIU6kLsvKECKPe1AHKdS/MzANbkTF35Y4QgZsNpVXaCVL7adGBSzOdPFupDJJVOu +wa+uFRc/FuNJyH/TIn56/+R5J5C54OxIYNxvW3WF4eHKLJYk/JZOMMfy4iWm7Sql +0nDC5O435nK4F4Jb4GLPlUIzioIy2OWqGoFHXymbGhL1tWaqasYmED4n3AMqlYw6 +xnNhdWOc/KZelPl9nanybyh0IIdZqUKZleRt4BxSgIT8FqC2sZuZ8z7O9s987Naz +Q32SKaP4i2M9lai/Y2QYfKo+wlG+egmxtujz7etQMGlpgBZzFLdJ8/w4U11ku1ai +om74RIn8zl/LHjMQHnCKGoVlscTI1ZPt+p+p8hO2/9vOwTR8y8O/3DQSOfTSipwc +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 +YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0 +QjVFRUI2OERDNDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2pl +Y3Qub3JnL3BvbGljeS50eHQACgkQjcQ6KEiCHjIaqBAA0BuEs7horx6iCq4cjAhv +YPLrxuC4fKEfVyhAjCJMJSFFCPAlGgU+BjyPNDD57wzKAmUkdJG+Ss25mwWXa53w +5R2kDqDnHocOdZGtxZ7zx/uUd2eWLNBfVuK7nHOk1d1Hs0OZBnckc+MCqnLtuYe5 +68pa9+jW6cNIjAnzMIListmoXWgYYWJvMKeBMG4DGtYJ8w7CJQjOHc5yar12DrX3 +wnQ7hXtFuuqQblpEUnLnZGvHf2NKMZfBBMcP96h9OmLGNa+vmNYsMyPKU7n5hPgX +nTgmQ4xrv1G7JukjppZRA8SFoxupcaQeTixyWERGBhBiAbwZsbQz8L/TVZKierzg +sdNngHcFzE8MyjuJDvTos7qXPmgSRXFqJLRn0ZxpR5V1V8BVZUqCGuSZT89TizsD +z5vyv8c9r7HKD4pRjw32P2dgcEqyGRkqERAgSuFpObP+juty+kxYyfnadBNCyjgP +s7u0GmsTt4CZi7BbowNRL6bynrwrmQI9LJI1bPhgqfdDUbqG3HXwHz80oRFfKou8 +JTYKxK4Iumfw2l/uAACma5ZyrwIDBX/H5XEQqch4sORzQnuhlTmZRf6ldVIIWjdJ +ef+DpOt12s+cS2F4D5g8G6t9CprCLYyrXiHwM/U8N5ywL9IeYKSWJxa7si3l9A6o +ZxOds8F/UJYDSIB97MQFzBo= +=JdC7 +-----END PGP PUBLIC KEY BLOCK-----

1 0

[tor/maint-0.2.4] Code to blacklist authority signing keys
by nickm＠torproject.org 14 Apr '14

14 Apr '14

commit 50ad3939242885b1a1a11688abd0c9756631747f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 11 10:22:14 2014 -0400 Code to blacklist authority signing keys (I need a list of actual signing keys to blacklist.) --- changes/bug11464_023 | 5 +++++ src/or/networkstatus.c | 11 +++++++++++ src/or/routerlist.c | 22 ++++++++++++++++++++++ src/or/routerlist.h | 1 + src/or/routerparse.c | 8 ++++++++ 5 files changed, 47 insertions(+) diff --git a/changes/bug11464_023 b/changes/bug11464_023 new file mode 100644 index 0000000..a9cd658 --- /dev/null +++ b/changes/bug11464_023 @@ -0,0 +1,5 @@ + o Major features (security): + - Block every authority signing key that was used on an authority + vulnerable to the "heartbleed" bug in openssl (CVE-2014-0160). + (We don't have any evidence that these keys _were_ compromised; + we're doing this to be prudent.) Resolves ticket 11464. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index e780ead..10cc562 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -453,6 +453,17 @@ networkstatus_check_document_signature(const networkstatus_t *consensus, DIGEST_LEN)) return -1; + if (authority_cert_is_blacklisted(cert)) { + /* We implement blacklisting for authority signing keys by treating + * all their signatures as always bad. That way we don't get into + * crazy loops of dropping and re-fetching signatures. */ + log_warn(LD_DIR, "Ignoring a consensus signature made with deprecated" + " signing key %s", + hex_str(cert->signing_key_digest, DIGEST_LEN)); + sig->bad_signature = 1; + return 0; + } + signed_digest_len = crypto_pk_keysize(cert->signing_key); signed_digest = tor_malloc(signed_digest_len); if (crypto_pk_public_checksig(cert->signing_key, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3c39e36..e993e13 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -458,6 +458,28 @@ authority_cert_dl_failed(const char *id_digest, int status) download_status_failed(&cl->dl_status, status); } +static const char *BAD_SIGNING_KEYS[] = { + "----------------------------------------", + NULL, +}; + +/** DOCDOC */ +int +authority_cert_is_blacklisted(const authority_cert_t *cert) +{ + char hex_digest[HEX_DIGEST_LEN+1]; + int i; + base16_encode(hex_digest, sizeof(hex_digest), + cert->signing_key_digest, sizeof(cert->signing_key_digest)); + + for (i = 0; BAD_SIGNING_KEYS[i]; ++i) { + if (!strcasecmp(hex_digest, BAD_SIGNING_KEYS[i])) { + return 1; + } + } + return 0; +} + /** Return true iff when we've been getting enough failures when trying to * download the certificate with ID digest <b>id_digest</b> that we're willing * to start bugging the user about it. */ diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 8dcc6eb..bd55b7b 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -25,6 +25,7 @@ void authority_cert_dl_failed(const char *id_digest, int status); void authority_certs_fetch_missing(networkstatus_t *status, time_t now); int router_reload_router_list(void); int authority_cert_dl_looks_uncertain(const char *id_digest); +int authority_cert_is_blacklisted(const authority_cert_t *cert); smartlist_t *router_get_trusted_dir_servers(void); const routerstatus_t *router_pick_directory_server(dirinfo_type_t type, diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 299d07d..97e0bc8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3053,6 +3053,14 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, log_warn(LD_DIR,"Mismatch between identities in certificate and vote"); goto err; } + if (ns->type != NS_TYPE_CONSENSUS) { + if (authority_cert_is_blacklisted(ns->cert)) { + log_warn(LD_DIR, "Rejecting vote signature made with blacklisted " + "signing key %s", + hex_str(ns->cert->signing_key_digest, DIGEST_LEN)); + goto err; + } + } voter->address = tor_strdup(tok->args[2]); if (!tor_inet_aton(tok->args[3], &in)) { log_warn(LD_DIR, "Error decoding IP address %s in network-status.",

1 0

[tor/maint-0.2.4] Tweak changes file and comment dates.
by nickm＠torproject.org 14 Apr '14

14 Apr '14

commit 09ed8a5dbb5216caae0055c1608abbc8c76412c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 17:58:49 2014 -0400 Tweak changes file and comment dates. --- changes/bug11464_023 | 2 +- src/or/routerlist.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug11464_023 b/changes/bug11464_023 index a9cd658..80c04b2 100644 --- a/changes/bug11464_023 +++ b/changes/bug11464_023 @@ -1,5 +1,5 @@ o Major features (security): - - Block every authority signing key that was used on an authority + - Block authority signing keys that were used on an authorities vulnerable to the "heartbleed" bug in openssl (CVE-2014-0160). (We don't have any evidence that these keys _were_ compromised; we're doing this to be prudent.) Resolves ticket 11464. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7cbf6ef..a7968be 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -460,9 +460,9 @@ authority_cert_dl_failed(const char *id_digest, int status) static const char *BAD_SIGNING_KEYS[] = { "09CD84F751FD6E955E0F8ADB497D5401470D697E", // Expires 2015-01-11 16:26:31 -// dizum still needs to rotate as of 2014-04-04 +// dizum still needs to rotate as of 2014-04-14 //"0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26 -// dannenberg still needs to rotate as of 2014-04-04 +// dannenberg still needs to rotate as of 2014-04-14 //"57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09 "87326329007AF781F587AF5B594E540B2B6C7630", // Expires 2014-07-17 11:10:09 "98CC82342DE8D298CF99D3F1A396475901E0D38E", // Expires 2014-11-10 13:18:56

1 0