summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/feature_encrypt-storage-key-with-kdf6
-rw-r--r--src/leap/soledad/tests/test_soledad.py1
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/feature_encrypt-storage-key-with-kdf b/changes/feature_encrypt-storage-key-with-kdf
new file mode 100644
index 00000000..f3ccf401
--- /dev/null
+++ b/changes/feature_encrypt-storage-key-with-kdf
@@ -0,0 +1,6 @@
+ o Change the local storage of the storage secret:
+ * Use scrypt to derive a key for the encryption of the storage secret.
+ * Store secret in a file called 'soledad.json' by default.
+ * Also store the salt and encryption details, as defined in the spec.
+ * This change is not backwards compatible (i.e. all previously stored
+ secrets are incompatible with this new encryption and storage scheme).
diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py
index 3f750bed..49358ab6 100644
--- a/src/leap/soledad/tests/test_soledad.py
+++ b/src/leap/soledad/tests/test_soledad.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
# test_soledad.py
# Copyright (C) 2013 LEAP
#