From 3cefb8291c69ff4354f5b4cfde1d92117aac3d26 Mon Sep 17 00:00:00 2001 From: drebs Date: Sun, 12 May 2013 19:16:16 -0300 Subject: Encrypt storage secret using scrypt KDF. * Change format of storage. * Refactor and modify export/import recovery documents logic. * Change storage secret length to 512. * Encrypt the storage document with derived function. * Refactor property name inside crypto submodule. * Add docstrings for new methods. * Fix wrong method call import_recovery_document. * Fix base64 encoding and secret/kdf length info. * Add missing header. * Add missing fields to comment. Closes 2475 and 2423. --- src/leap/soledad/crypto.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/leap/soledad/crypto.py') diff --git a/src/leap/soledad/crypto.py b/src/leap/soledad/crypto.py index 9d2227bd..605380ec 100644 --- a/src/leap/soledad/crypto.py +++ b/src/leap/soledad/crypto.py @@ -47,7 +47,7 @@ class SoledadCrypto(object): """ self._soledad = soledad self._pgp = openpgp.OpenPGPScheme(self._soledad) - self._symkey = None + self._secret = None def encrypt_sym(self, data, passphrase): """ @@ -112,19 +112,19 @@ class SoledadCrypto(object): @rtype: str @raise NoSymmetricSecret: if no symmetric secret was supplied. """ - if self._symkey is None: + if self._secret is None: raise NoSymmetricSecret() - return sha256('%s%s' % (self._symkey, suffix)).hexdigest() + return sha256('%s%s' % (self._secret, suffix)).hexdigest() # - # symkey setters/getters + # secret setters/getters # - def _get_symkey(self): - return self._symkey + def _get_secret(self): + return self._secret - def _set_symkey(self, symkey): - self._symkey = symkey + def _set_secret(self, secret): + self._secret = secret - symkey = property(_get_symkey, _set_symkey, + secret = property(_get_secret, _set_secret, doc='The key used for symmetric encryption') -- cgit v1.2.3