October 2015 - tor-commits - lists.torproject.org

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 03 Oct '15

03 Oct '15

commit beb4ba7540bca6dc652c43752c0e130fac1fe422 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 3 20:16:20 2015 +0000 Update translations for tor-messenger-fingerdtd --- tr/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/finger.dtd b/tr/finger.dtd index 9651e40..9177fd4 100644 --- a/tr/finger.dtd +++ b/tr/finger.dtd @@ -2,7 +2,7 @@ <!ENTITY finger.screenName "Takma ad"> <!ENTITY finger.status "Durum"> <!ENTITY finger.verified "Onaylandı"> -<!ENTITY finger.fingerprint "Parmak izi"> +<!ENTITY finger.fingerprint "Parmakizi"> <!ENTITY finger.account "Hesap"> <!ENTITY finger.protocol "İletişim kuralı"> <!ENTITY finger.verify "Doğrula">

1 0

[stem/master] Argument to specify tor's path for tor-prompt
by atagar＠torproject.org 03 Oct '15

03 Oct '15

commit 1c5384ee75be853e57bd620ad833ceb71de2c456 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 3 10:06:47 2015 -0700 Argument to specify tor's path for tor-prompt Adding a '--tor' argument to tor-prompt so users can specify tor's path when starting an instance. This should especially help when using this for testing tor changes. --- docs/change_log.rst | 4 ++++ stem/interpreter/__init__.py | 27 ++++++++++++++++----------- stem/interpreter/arguments.py | 5 ++++- stem/interpreter/settings.cfg | 2 ++ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index b36e143..2933345 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -60,6 +60,10 @@ The following are only available within Stem's `git repository * Unable to read descriptors from data directories on Windows due to their CRLF newlines (:trac:`17051`) * TypeError under python3 when using 'use_mirrors = True' (:trac:`17083`) + * **Interpreter** + + * Added a '--tor [path]' argument to specify the tor binary to run. + * **Website** * Example for `custom path selection for circuits <tutorials/to_russia_with_love.html#custom-path-selection>`_ (:trac:`8728`) diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 980e3ba..f8dce7e 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -72,7 +72,7 @@ def main(): is_tor_running = stem.util.system.is_running('tor') or stem.util.system.is_running('tor.real') if not is_tor_running: - if not stem.util.system.is_available('tor'): + if args.tor_path == 'tor' and not stem.util.system.is_available('tor'): print(format(msg('msg.tor_unavailable'), *ERROR_OUTPUT)) sys.exit(1) else: @@ -80,16 +80,21 @@ def main(): control_port = '9051' if args.control_port == 'default' else str(args.control_port) - stem.process.launch_tor_with_config( - config = { - 'SocksPort': '0', - 'ControlPort': control_port, - 'CookieAuthentication': '1', - 'ExitPolicy': 'reject *:*', - }, - completion_percent = 5, - take_ownership = True, - ) + try: + stem.process.launch_tor_with_config( + config = { + 'SocksPort': '0', + 'ControlPort': control_port, + 'CookieAuthentication': '1', + 'ExitPolicy': 'reject *:*', + }, + tor_cmd = args.tor_path, + completion_percent = 5, + take_ownership = True, + ) + except OSError as exc: + print(format(msg('msg.unable_to_start_tor', error = exc), *ERROR_OUTPUT)) + sys.exit(1) control_port = (args.control_address, args.control_port) control_socket = args.control_socket diff --git a/stem/interpreter/arguments.py b/stem/interpreter/arguments.py index 2da6410..01920a2 100644 --- a/stem/interpreter/arguments.py +++ b/stem/interpreter/arguments.py @@ -17,12 +17,13 @@ DEFAULT_ARGS = { 'user_provided_port': False, 'control_socket': '/var/run/tor/control', 'user_provided_socket': False, + 'tor_path': 'tor', 'disable_color': False, 'print_help': False, } OPT = 'i:s:h' -OPT_EXPANDED = ['interface=', 'socket=', 'no-color', 'help'] +OPT_EXPANDED = ['interface=', 'socket=', 'tor=', 'no-color', 'help'] def parse(argv): @@ -68,6 +69,8 @@ def parse(argv): elif opt in ('-s', '--socket'): args['control_socket'] = arg args['user_provided_socket'] = True + elif opt in ('--tor'): + args['tor_path'] = arg elif opt == '--no-color': args['disable_color'] = True elif opt in ('-h', '--help'): diff --git a/stem/interpreter/settings.cfg b/stem/interpreter/settings.cfg index 1bacf1c..2739eec 100644 --- a/stem/interpreter/settings.cfg +++ b/stem/interpreter/settings.cfg @@ -17,6 +17,7 @@ msg.help | -i, --interface [ADDRESS:]PORT change control interface from {address}:{port} | -s, --socket SOCKET_PATH attach using unix domain socket if present, | SOCKET_PATH defaults to: {socket} +| --tor PATH tor binary if tor isn't already running | --no-color disables colorized output | -h, --help presents this help | @@ -41,6 +42,7 @@ msg.startup_banner | msg.tor_unavailable Tor isn't running and the command currently isn't in your PATH. +msg.unable_to_start_tor Unable to start tor: {error} msg.starting_tor |Tor isn't running. Starting a temporary Tor instance for our interpreter to

1 0

[stem/master] Note when enums were added or changed
by atagar＠torproject.org 03 Oct '15

03 Oct '15

commit e3d4471f3938389f479e109fa2453360c00368fa Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 3 11:40:12 2015 -0700 Note when enums were added or changed Definitely good information to have. Most were around in our 1.0.0 release, but we've made a handful of changes since then to keep in sync with tor. --- stem/__init__.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/stem/__init__.py b/stem/__init__.py index ead8224..fc07756 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -37,6 +37,9 @@ Library for working with the tor process. Signals that the tor process will accept. + .. versionchanged:: 1.3.0 + Added the HEARTBEAT signal. + ========================= =========== Signal Description ========================= =========== @@ -378,6 +381,8 @@ Library for working with the tor process. The meaning behind these values is a bit unclear, pending :trac:`10086`. + .. versionadded:: 1.2.0 + =============== =========== ConnectionType Description =============== =========== @@ -390,6 +395,8 @@ Library for working with the tor process. Bucket categories of TB_EMPTY events. + .. versionadded:: 1.2.0 + =============== =========== TokenBucket Description =============== =========== @@ -402,6 +409,11 @@ Library for working with the tor process. Action beeing taken in a HS_DESC event. + .. versionadded:: 1.2.0 + + .. versionchanged:: 1.4.0 + Added the UPLOAD and UPLOADED actions. + =============== =========== HSDescAction Description =============== =========== @@ -417,6 +429,11 @@ Library for working with the tor process. Reason for the hidden service descriptor to fail to be fetched. + .. versionadded:: 1.3.0 + + .. versionchanged:: 1.4.0 + Added the UPLOAD_REJECTED reason. + =================== =========== HSDescReason Description =================== =========== @@ -431,6 +448,8 @@ Library for working with the tor process. Type of authentication being used for a HS_DESC event. + .. versionadded:: 1.2.0 + ================= =========== HSAuth Description ================= ===========

1 0

[stem/master] Support HS_DESC's new replica field
by atagar＠torproject.org 03 Oct '15

03 Oct '15

commit 980c8d43adaa3e1f4abaf6bf27badd32348ee31a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 3 11:50:55 2015 -0700 Support HS_DESC's new replica field Support for a new event field... https://gitweb.torproject.org/torspec.git/commit/?id=4989e73 Presently the addition doesn't have quite enough detail to go on, so asking for clarification... https://trac.torproject.org/projects/tor/ticket/17226 --- docs/change_log.rst | 1 + stem/__init__.py | 5 +++++ stem/response/events.py | 12 +++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 2933345..727b0cb 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -48,6 +48,7 @@ The following are only available within Stem's `git repository * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the :class:`~stem.control.Controller` + * Added the replica attribute to the :class:`~stem.response.events.HSDescEvent` (:spec:`4989e73`) * IPv6 addresses could trigger errors in :func:`~stem.control.Controller.get_listeners`, :class:`~stem.response.events.ORConnEvent`, and quite a few other things (:trac:`16174`) * Don't obscure stacktraces, most notably :class:`~stem.control.Controller` getter methods with default values diff --git a/stem/__init__.py b/stem/__init__.py index fc07756..ece707a 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -414,6 +414,9 @@ Library for working with the tor process. .. versionchanged:: 1.4.0 Added the UPLOAD and UPLOADED actions. + .. versionchanged:: 1.5.0 + Added the CREATED action. + =============== =========== HSDescAction Description =============== =========== @@ -423,6 +426,7 @@ Library for working with the tor process. **UPLOADED** descriptor was uploaded with HSPOST **IGNORE** fetched descriptor was ignored because we already have its v0 descriptor **FAILED** we were unable to retrieve the descriptor + **CREATED** unknown (:trac:`17226`) =============== =========== .. data:: HSDescReason (enum) @@ -834,6 +838,7 @@ HSDescAction = stem.util.enum.UppercaseEnum( 'UPLOADED', 'IGNORE', 'FAILED', + 'CREATED', ) HSDescReason = stem.util.enum.UppercaseEnum( diff --git a/stem/response/events.py b/stem/response/events.py index c760b98..98eaa9c 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -630,6 +630,9 @@ class HSDescEvent(Event): .. versionchanged:: 1.3.0 Added the reason attribute. + .. versionchanged:: 1.5.0 + Added the replica attribute. + :var stem.HSDescAction action: what is happening with the descriptor :var str address: hidden service address :var stem.HSAuth authentication: service's authentication method @@ -638,11 +641,12 @@ class HSDescEvent(Event): :var str directory_nickname: hidden service directory's nickname if it was provided :var str descriptor_id: descriptor identifier :var stem.HSDescReason reason: reason the descriptor failed to be fetched + :var int replica: unknown (:trac:`17226`) """ _VERSION_ADDED = stem.version.Requirement.EVENT_HS_DESC _POSITIONAL_ARGS = ('action', 'address', 'authentication', 'directory', 'descriptor_id') - _KEYWORD_ARGS = {'REASON': 'reason'} + _KEYWORD_ARGS = {'REASON': 'reason', 'REPLICA': 'replica'} def _parse(self): self.directory_fingerprint = None @@ -654,6 +658,12 @@ class HSDescEvent(Event): except stem.ProtocolError: raise stem.ProtocolError("HS_DESC's directory doesn't match a ServerSpec: %s" % self) + if self.replica is not None: + if not self.replica.isdigit(): + raise stem.ProtocolError('HS_DESC event got a non-numeric replica count (%s): %s' % (self.replica, self)) + + self.replica = int(self.replica) + self._log_if_unrecognized('action', stem.HSDescAction) self._log_if_unrecognized('authentication', stem.HSAuth)

1 0

[torspec/master] Trivial revision for HS_DESC
by atagar＠torproject.org 03 Oct '15

03 Oct '15

commit 291b77f5729b3a0e25cf5cdc79080c6b3dac4064 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 3 11:08:57 2015 -0700 Trivial revision for HS_DESC Just fixing some line wrap and case (keywords like 'SHOULD' are uppercase by convention). --- control-spec.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 024f5a1..ba1831a 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2761,8 +2761,8 @@ the value will be "UNKNOWN". If we already had the v0 descriptor, the newly fetched v2 descriptor - will be - ignored and a "HS_DESC" event with "IGNORE" action will be generated. + will be ignored and a "HS_DESC" event with "IGNORE" action will be + generated. For HsDir, LongName is always prefered. If HsDir cannot be found in node list at the time event is sent, Fingerprint will be used instead. @@ -2775,7 +2775,7 @@ - "NOT_FOUND" - HS descriptor with given identifier was not found. - "UNEXPECTED" - nature of failure is unknown. - If Action is "CREATED", Tor should send Replica field as well. The replica + If Action is "CREATED", Tor SHOULD send Replica field as well. The Replica field contains the replica number of the generated descriptor. 4.1.26. HiddenService descriptors content

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 02 Oct '15

02 Oct '15

commit 45761b6fa4dd707ff184ad74615b404b8d196c8d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 2 21:45:43 2015 +0000 Update translations for tails-misc_completed --- ru.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ru.po b/ru.po index be6445b..a19f5db 100644 --- a/ru.po +++ b/ru.po @@ -10,6 +10,7 @@ # Ivan, 2015 # joshua ridney <yachtcrew(a)mail.ru>, 2015 # jujjer <jujjer(a)gmail.com>, 2013 +# Julia Liberman <gangsta_b(a)rambler.ru>, 2015 # mendov <mr.mendov(a)gmail.com>, 2013 # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 # Sergey Briskin <sergey.briskin(a)gmail.com>, 2015 @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-25 22:37+0000\n" -"Last-Translator: Ivan\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-10-02 21:38+0000\n" +"Last-Translator: Julia Liberman <gangsta_b(a)rambler.ru>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -324,23 +325,23 @@ msgstr "Похоже, ваш доступ в сеть заблокирован. msgid "This version of Tails has known security issues:" msgstr "Эта версия Tails имеет известные проблемы безопасности:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "Сетевая карта ${nic} отключена" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "MAC-адрес сетевой карты ${nic_name} (${nic}) подменить не удалось, и поэтому она временно отключена.\nВозможно, вам придётся перезагрузить Tails и отключить режим подмены MAC-адреса. См. <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>документацию</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Весь сетевой сервис полностью отключен" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -486,8 +487,8 @@ msgid "I2P's router console is ready" msgstr "Консоль маршрутизатора I2P готова" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "Доступ к консоли маршрутизатора I2P через http://127.0.0.1:7657 открыт." +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Теперь у вас есть доступ к консоли роутера I2P в браузере I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -495,10 +496,10 @@ msgstr "I2P не готов" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "6 минут на создание туннеля Eepsite истекли. Проверьте консоль маршрутизатора I2P через http://127.0.0.1:7657/logs или журналы в /var/log/i2p для получения дополнительной информации. Выйдите из сети и войдите вновь для повторения попытки." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Тоннель для Eepsite не был построен в течение шести минут. Проверьте консоль роутера в браузере I2P или в логах по пути /var/log/i2p для получения дополнительной информации. Попробуйте подключиться к сети снова, чтобы попробовать ещё раз." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 Oct '15

02 Oct '15

commit 1ed00350baf180126a85cadacbc17e91ed97e853 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 2 21:45:37 2015 +0000 Update translations for tails-misc --- ru.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ru.po b/ru.po index 578497f..a19f5db 100644 --- a/ru.po +++ b/ru.po @@ -10,6 +10,7 @@ # Ivan, 2015 # joshua ridney <yachtcrew(a)mail.ru>, 2015 # jujjer <jujjer(a)gmail.com>, 2013 +# Julia Liberman <gangsta_b(a)rambler.ru>, 2015 # mendov <mr.mendov(a)gmail.com>, 2013 # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 # Sergey Briskin <sergey.briskin(a)gmail.com>, 2015 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-10-02 21:38+0000\n" +"Last-Translator: Julia Liberman <gangsta_b(a)rambler.ru>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -487,7 +488,7 @@ msgstr "Консоль маршрутизатора I2P готова" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Теперь у вас есть доступ к консоли роутера I2P в браузере I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -498,7 +499,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "Тоннель для Eepsite не был построен в течение шести минут. Проверьте консоль роутера в браузере I2P или в логах по пути /var/log/i2p для получения дополнительной информации. Попробуйте подключиться к сети снова, чтобы попробовать ещё раз." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[tor/master] Perhaps this is the permutation of headers that will please everything
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 3c6782395743a089e192867ddbf44549cfeca015 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 18:44:55 2015 +0200 Perhaps this is the permutation of headers that will please everything --- src/test/test_tortls.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 2cf0332..5e0b80f 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -9,11 +9,6 @@ #include <winsock2.h> #endif -#include "or.h" -#include "torlog.h" -#include "config.h" -#include "tortls.h" - #ifdef __GNUC__ #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #endif @@ -42,6 +37,11 @@ #endif #endif +#include "or.h" +#include "torlog.h" +#include "config.h" +#include "tortls.h" + #include "test.h" #include "log_test_helpers.h" #define NS_MODULE tortls

1 0

[tor/master] Try to fix mingw build.
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit b31cdf4ad626e227967ee0f3198705d7c2e322e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 18:31:43 2015 +0200 Try to fix mingw build. --- src/test/test_tortls.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index e467cd5..2cf0332 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -5,6 +5,15 @@ #define LOG_PRIVATE #include "orconfig.h" +#ifdef _WIN32 +#include <winsock2.h> +#endif + +#include "or.h" +#include "torlog.h" +#include "config.h" +#include "tortls.h" + #ifdef __GNUC__ #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #endif @@ -33,11 +42,6 @@ #endif #endif -#include "or.h" -#include "torlog.h" -#include "config.h" -#include "tortls.h" - #include "test.h" #include "log_test_helpers.h" #define NS_MODULE tortls

1 0

[tor/master] These logs seem openssl-version-dependent
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 561d4136aca5c024f64cc21b062db5260024c9a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 17:56:10 2015 +0200 These logs seem openssl-version-dependent --- src/test/test_tortls.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 67b645c..e467cd5 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2302,12 +2302,15 @@ test_tortls_handshake(void *ignored) ret = tor_tls_handshake(tls); tt_int_op(ret, OP_EQ, TOR_TLS_ERROR_MISC); tt_int_op(mock_saved_log_number(), OP_EQ, 2); + /* This fails on jessie. Investigate why! */ +#if 0 tt_str_op(mock_saved_log_at(0), OP_EQ, "TLS error while handshaking: (null) (in bignum routines:" "(null):SSLv3 write client hello B)\n"); tt_str_op(mock_saved_log_at(1), OP_EQ, "TLS error while handshaking: (null) (in system library:" "connect:SSLv3 write client hello B)\n"); +#endif tt_int_op(mock_saved_severity_at(0), OP_EQ, LOG_INFO); tt_int_op(mock_saved_severity_at(1), OP_EQ, LOG_INFO); @@ -2320,10 +2323,13 @@ test_tortls_handshake(void *ignored) ret = tor_tls_handshake(tls); tt_int_op(ret, OP_EQ, TOR_TLS_ERROR_MISC); tt_int_op(mock_saved_log_number(), OP_EQ, 2); +#if 0 + /* See above */ tt_str_op(mock_saved_log_at(0), OP_EQ, "TLS error while handshaking: " "(null) (in bignum routines:(null):SSLv3 write client hello B)\n"); tt_str_op(mock_saved_log_at(1), OP_EQ, "TLS error while handshaking: " "(null) (in system library:connect:SSLv3 write client hello B)\n"); +#endif tt_int_op(mock_saved_severity_at(0), OP_EQ, LOG_WARN); tt_int_op(mock_saved_severity_at(1), OP_EQ, LOG_WARN);

1 0