From 88d52a578d0d7b06e138820fc0df24ba5f22e0e1 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 30 Jun 2017 12:38:40 +0200 Subject: [feat] use OpenSSL backend for scrypt if available This needs OpenSSL >= 1.1, otherwise it will keep using the scrypt dependency. We should think about deprecating scrypt as a dependency when we can be sure that the adoption of libssl 1.1 is wide enough. I think that at some point (soledad 0.11 or so) we can drop the scrypt dependency, which was being somehow problematic at times (the _scrypt.so was not appearing when installing with pip, needed workarounds). From that moment on, we can raise an error if an old libssl is found and no scrypt can be imported - leaving that to the user/packager. In debian stretch and afterwards, you can get that version by installing libssl-dev - Related: #8472 --- src/leap/soledad/client/_secrets/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/leap/soledad/client/_secrets/__init__.py') diff --git a/src/leap/soledad/client/_secrets/__init__.py b/src/leap/soledad/client/_secrets/__init__.py index b6c81cda..c92b9905 100644 --- a/src/leap/soledad/client/_secrets/__init__.py +++ b/src/leap/soledad/client/_secrets/__init__.py @@ -16,13 +16,13 @@ # along with this program. If not, see . import os -import scrypt from leap.soledad.common.log import getLogger from leap.soledad.client._secrets.storage import SecretsStorage from leap.soledad.client._secrets.crypto import SecretsCrypto from leap.soledad.client._secrets.util import emit, UserDataMixin +from leap.soledad.client import _scrypt logger = getLogger(__name__) @@ -121,9 +121,8 @@ class Secrets(UserDataMixin): def local_key(self): # local storage key is scrypt-derived from `local_secret` and # `local_salt` above - secret = scrypt.hash( - password=self.local_secret, + return _scrypt.hash( + self.local_secret, salt=self.local_salt, buflen=32, # we need a key with 256 bits (32 bytes) ) - return secret -- cgit v1.2.3