tor-commits June 2015

tor-commits@lists.torproject.org

22 participants
1870 discussions

[bridgedb/develop] Remove unused imports from bridgedb.Main module.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit e792fc2c56eae9467dbc30f0489c3f78dd02146b Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 11 21:23:46 2015 +0000 Remove unused imports from bridgedb.Main module. Conflicts: lib/bridgedb/Main.py --- lib/bridgedb/Main.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index d6b31a9..1714a53 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -27,19 +27,15 @@ from bridgedb import proxy from bridgedb import safelog from bridgedb import schedule from bridgedb import util -from bridgedb.bridges import InvalidPluggableTransportIP from bridgedb.bridges import MalformedBridgeInfo -from bridgedb.bridges import MalformedPluggableTransport from bridgedb.bridges import MissingServerDescriptorDigest from bridgedb.bridges import ServerDescriptorDigestMismatch from bridgedb.bridges import ServerDescriptorWithoutNetworkstatus from bridgedb.bridges import PluggableTransport from bridgedb.bridges import Bridge from bridgedb.configure import loadConfig -from bridgedb.configure import Conf from bridgedb.parse import descriptors from bridgedb.parse import options -from bridgedb.parse.addr import isIPAddress import bridgedb.Storage

1 0

[bridgedb/develop] Remove unnecessary database initialisation from bridgedb.Main.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 3bad1b9fcb698ba5d74a07499dcdd23409d5b044 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 11 21:24:07 2015 +0000 Remove unnecessary database initialisation from bridgedb.Main. Conflicts: lib/bridgedb/Main.py --- lib/bridgedb/Main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 1714a53..76c122c 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -378,7 +378,6 @@ def run(options, reactor=reactor): # Initialize our DB. bridgedb.Storage.initializeDBLock() - db = bridgedb.Storage.openDatabase(cfg.DB_FILE + ".sqlite") bridgedb.Storage.setDBFilename(cfg.DB_FILE + ".sqlite") load(state, splitter, clear=False)

1 0

[bridgedb/develop] Remove additional unused imports from bridgedb.Main module.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 8694dbf65fe08cf615ceda260c48a664c2a8313e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:19:19 2015 +0000 Remove additional unused imports from bridgedb.Main module. --- lib/bridgedb/Main.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 76c122c..c2e44ca 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -11,12 +11,11 @@ """This module sets up BridgeDB and starts the servers running.""" +import logging import os import signal import sys import time -import logging -import gettext from twisted.internet import reactor from twisted.internet import task @@ -24,18 +23,14 @@ from twisted.internet import task from bridgedb import crypto from bridgedb import persistent from bridgedb import proxy -from bridgedb import safelog -from bridgedb import schedule from bridgedb import util from bridgedb.bridges import MalformedBridgeInfo from bridgedb.bridges import MissingServerDescriptorDigest from bridgedb.bridges import ServerDescriptorDigestMismatch from bridgedb.bridges import ServerDescriptorWithoutNetworkstatus -from bridgedb.bridges import PluggableTransport from bridgedb.bridges import Bridge from bridgedb.configure import loadConfig from bridgedb.parse import descriptors -from bridgedb.parse import options import bridgedb.Storage

1 0

[bridgedb/develop] Fix typo in bridgedb.bridges.Bridge.__init__() docstring.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit a768c8463f4e359de4122a550daeaca06595cfad Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:52:31 2015 +0000 Fix typo in bridgedb.bridges.Bridge.__init__() docstring. --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index e1c8738..0dfc4b1 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -821,7 +821,7 @@ class Bridge(BridgeBackwardsCompatibility): _checkServerDescriptorSignature = True def __init__(self, *args, **kwargs): - """Create a and store information for a new ``Bridge``. + """Create and store information for a new ``Bridge``. .. info: For backwards compatibility, `nickname`, `ip`, and `orport` must be the first, second, and third arguments, respectively. The

1 0

[bridgedb/develop] Fix a docstring typo in bridgedb.Storage.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit fe567ec2243db738c03cf88ab76c6980ad91b046 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 11 20:21:05 2015 +0000 Fix a docstring typo in bridgedb.Storage. --- lib/bridgedb/Storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index ef76829..d0660cf 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -384,7 +384,7 @@ _OPENED_DB = None _REFCOUNT = 0 def clearGlobalDB(): - """Start from scratch + """Start from scratch. This is currently only used in unit tests. """

1 0

[bridgedb/develop] Remove additional unused imports from bridgedb.Storage.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit ed27c74d78deea385be1b353d0407d4fe49ef0df Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:31:19 2015 +0000 Remove additional unused imports from bridgedb.Storage. --- lib/bridgedb/Storage.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index d0660cf..5d0eb6e 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -3,7 +3,6 @@ # See LICENSE for licensing information import calendar -import os import logging import binascii import sqlite3 @@ -11,10 +10,9 @@ import time import hashlib from contextlib import GeneratorContextManager from functools import wraps -from ipaddr import IPAddress, IPv6Address, IPv4Address +from ipaddr import IPAddress import sys -import bridgedb.Stability as Stability from bridgedb.Stability import BridgeHistory import threading

1 0

[bridgedb/develop] Fix old-style class bridgedb.Storage.BridgeData.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 952f2823953758e02bfc13631dd1d83e6a261cd8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:32:13 2015 +0000 Fix old-style class bridgedb.Storage.BridgeData. --- lib/bridgedb/Storage.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 5d0eb6e..334aadb 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -107,7 +107,8 @@ SCHEMA_2TO3_SCRIPT = """ """ SCHEMA3_SCRIPT = SCHEMA2_SCRIPT + SCHEMA_2TO3_SCRIPT -class BridgeData: + +class BridgeData(object): """Value class carrying bridge information: hex_key - The unique hex key of the given bridge address - Bridge IP address @@ -126,6 +127,7 @@ class BridgeData: self.first_seen = first_seen self.last_seen = last_seen + class Database(object): def __init__(self, sqlite_fname): self._conn = openDatabase(sqlite_fname)

1 0

[bridgedb/develop] Remove unused variable in bridgedb.Storage.Database.getAllBridgeHistory().
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit cbe9c2d44d4e3cd1ff37c9c97b129acad9e5739f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:32:32 2015 +0000 Remove unused variable in bridgedb.Storage.Database.getAllBridgeHistory(). --- lib/bridgedb/Storage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 334aadb..ea9d26b 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -288,7 +288,6 @@ class Database(object): cur = self._cur v = cur.execute("SELECT * FROM BridgeHistory") if v is None: return - fp = {} for h in v: yield BridgeHistory(h[0],IPAddress(h[1]),h[2],h[3],h[4],h[5],h[6],h[7],h[8],h[9],h[10])

1 0

[tor/master] Merge remote-tracking branch 'public/bug15760_hard_026_v2'
by nickm＠torproject.org 02 Jun '15

02 Jun '15

commit e48f8e5e87603812a6b1844a5fa27bbc44a3543e Merge: 34edf17 8024f6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 2 15:08:14 2015 -0400 Merge remote-tracking branch 'public/bug15760_hard_026_v2' configure.ac | 1 + src/common/tortls.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/master] A few more minor OpenSSL 1.1 fixes.
by nickm＠torproject.org 02 Jun '15

02 Jun '15

commit 8024f6a75f00044fd342323d26e9907fc571c283 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Jun 2 18:58:57 2015 +0000 A few more minor OpenSSL 1.1 fixes. * Use `TLS_method()` instead of the deprecated `SSLv23_method()` * Fix one missed conversion to `SSL_CIPHER_get_id()` --- configure.ac | 1 + src/common/tortls.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ab96c20..b8ca188 100644 --- a/configure.ac +++ b/configure.ac @@ -640,6 +640,7 @@ AC_CHECK_FUNCS([ \ SSL_get_client_ciphers \ SSL_get_client_random \ SSL_CIPHER_find \ + TLS_method ]) LIBS="$save_LIBS" LDFLAGS="$save_LDFLAGS" diff --git a/src/common/tortls.c b/src/common/tortls.c index deeee5f..1812e3f 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1252,8 +1252,13 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, #endif /* Tell OpenSSL to use TLS 1.0 or later but not SSL2 or SSL3. */ +#ifdef HAVE_TLS_METHOD + if (!(result->ctx = SSL_CTX_new(TLS_method()))) + goto error; +#else if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; +#endif SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); @@ -1497,7 +1502,7 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher) * cipher with the appropriate 3 bytes. */ c = SSL_CIPHER_find((SSL*)ssl, cipherid); if (c) - tor_assert((c->id & 0xffff) == cipher); + tor_assert((SSL_CIPHER_get_id(c) & 0xffff) == cipher); return c != NULL; } #elif defined(HAVE_STRUCT_SSL_METHOD_ST_GET_CIPHER_BY_CHAR) @@ -1540,7 +1545,11 @@ static void prune_v2_cipher_list(const SSL *ssl) { uint16_t *inp, *outp; +#ifdef HAVE_TLS_METHOD + const SSL_METHOD *m = TLS_method(); +#else const SSL_METHOD *m = SSLv23_method(); +#endif inp = outp = v2_cipher_list; while (*inp) {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2015