diff options
| author | Tayane Fernandes <tayane.rmf@gmail.com> | 2017-02-15 18:06:11 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 18:06:11 -0200 |
| commit | 48a1ca5f8310ef6fb61dc821c38d435617b19d5c (patch) | |
| tree | 8743f417e45166d6780be1dc7ffee8d4f20bb29e /service/pixelated | |
| parent | 2c9cc5ac00865e9d80bf0dc07dd8e84df0fbae5e (diff) | |
| parent | 49fd4083b742fb13f7c759c4edee3f8fb2818097 (diff) | |
Merge pull request #985 from pixelated/soledad-merge
Changes to keep the compatibility with new soledad changes
Diffstat (limited to 'service/pixelated')
| -rw-r--r-- | service/pixelated/config/sessions.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py index eb233a9f..594b8e35 100644 --- a/service/pixelated/config/sessions.py +++ b/service/pixelated/config/sessions.py @@ -95,8 +95,7 @@ class LeapSessionFactory(object): server_url=server_url, cert_file=api_cert, shared_db=None, - auth_token=user_token, - defer_encryption=False) + auth_token=user_token) defer.returnValue(soledad) except (WrongMacError, UnknownMacMethodError), e: raise SoledadWrongPassphraseException(e) |