summaryrefslogtreecommitdiff
path: root/changes
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 /changes
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 'changes')
-rw-r--r--changes/feature_use-raw-sqlcipher-key-with-scrypt-as-kdf1
1 files changed, 1 insertions, 0 deletions
diff --git a/changes/feature_use-raw-sqlcipher-key-with-scrypt-as-kdf b/changes/feature_use-raw-sqlcipher-key-with-scrypt-as-kdf
new file mode 100644
index 00000000..385c1c84
--- /dev/null
+++ b/changes/feature_use-raw-sqlcipher-key-with-scrypt-as-kdf
@@ -0,0 +1 @@
+ o Use scrypt to derive the key for local encryption.