summaryrefslogtreecommitdiff
path: root/src/leap/soledad/backends/sqlcipher.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-05 11:02:08 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-05 11:02:08 -0300
commitebca23cd426690453cf5581f32a44121ae1219ce (patch)
treefdbb2919dada861db0907972b6b58232334c0edf /src/leap/soledad/backends/sqlcipher.py
parentfbbb1f1cb315a0d4ada2db5b9455582327b75038 (diff)
parent248f50d4a2d1586265eb70de200be271488442e1 (diff)
Merge remote-tracking branch 'drebs/feature/2716-use-raw-sqlcipher-key-with-scrypt-as-kdf-2' into develop
Diffstat (limited to 'src/leap/soledad/backends/sqlcipher.py')
-rw-r--r--src/leap/soledad/backends/sqlcipher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/soledad/backends/sqlcipher.py b/src/leap/soledad/backends/sqlcipher.py
index 5825b844..d6d62f21 100644
--- a/src/leap/soledad/backends/sqlcipher.py
+++ b/src/leap/soledad/backends/sqlcipher.py
@@ -483,7 +483,7 @@ class SQLCipherDatabase(sqlite_backend.SQLitePartialExpandDatabase):
"""
if not all(c in string.hexdigits for c in key):
raise NotAnHexString(key)
- db_handle.cursor().execute('PRAGMA key = "x\'%s"' % passphrase)
+ db_handle.cursor().execute('PRAGMA key = "x\'%s"' % key)
@classmethod
def _pragma_cipher(cls, db_handle, cipher='aes-256-cbc'):