diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-10-27 13:58:56 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-10-29 16:50:07 -0300 |
| commit | 3b869fb7ffedc88c738e0a17347b9506d242cabe (patch) | |
| tree | 5702f87c2e0ce84a7d1a344b1b00387e994bce28 /server | |
| parent | bc8e8bea61b01e0b93593e24a816574f5a19ac61 (diff) | |
[feat] remove SSL tsafe monkeypatch
This was added for a Twisted 12 bug that should be gone by now.
Diffstat (limited to 'server')
| -rw-r--r-- | server/changes/feat_configurable_ensure | 2 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/server/changes/feat_configurable_ensure b/server/changes/feat_configurable_ensure index 34a20c86..8abd2ac9 100644 --- a/server/changes/feat_configurable_ensure +++ b/server/changes/feat_configurable_ensure @@ -2,4 +2,4 @@ o 'create-user-db' script now can be configured from soledad-server.conf when generating the user's security document. o Migrating a user's database to newest design documents is now possible by using a parameter '--migrate-all' on 'create-user-db' script. - +o Remove tsafe monkeypatch from SSL lib, as it was needed for Twisted <12 diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index fe67e45f..618ccb2b 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -94,12 +94,6 @@ from u1db.remote import http_app, utils from ._version import get_versions -# Keep OpenSSL's tsafe before importing Twisted submodules so we can put -# it back if Twisted==12.0.0 messes with it. -from OpenSSL import tsafe - -from twisted import version - from leap.soledad.server.auth import SoledadTokenAuthMiddleware from leap.soledad.server.gzip_middleware import GzipMiddleware from leap.soledad.server.lock_resource import LockResource @@ -112,13 +106,6 @@ from leap.soledad.server.sync import ( from leap.soledad.common import SHARED_DB_NAME from leap.soledad.common.couch import CouchServerState -old_tsafe = tsafe - -if version.base() == "12.0.0": - # Put OpenSSL's tsafe back into place. This can probably be removed if we - # come to use Twisted>=12.3.0. - sys.modules['OpenSSL.tsafe'] = old_tsafe - # ---------------------------------------------------------------------------- # Soledad WSGI application # ---------------------------------------------------------------------------- |