summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-08-30 20:30:25 -0400
committerJoey Hess <joeyh@joeyh.name>2016-08-30 20:32:43 -0400
commit298c2922dd59acb9e0894168df4a1f28bf853e1b (patch)
tree7f98788722386d451b6b8d3a635ff617d6d907ee
parent33594e304d8af7c68a20e56124b0e91f8c62b78d (diff)
downloadkeysafe-298c2922dd59acb9e0894168df4a1f28bf853e1b.tar.gz
key encryption hash benchmark was off by a factor of 16, fix
f2fa457a7e45721e94a3f5d0307faf874150cdb4 did in fact fix a laziness issue in the benchmark. This explains why restore was taking so long, although I need to re-run a real restore to double-check this.
-rw-r--r--TODO2
-rw-r--r--Tunables.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/TODO b/TODO
index 6017b17..ab7464f 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
Soon:
-* Restore seems to take more like 2 hours than 50 minutes. Check this.
+* Run a key restore and make sure it takes 35 to 50 minutes.
* client/server Proof Of Work
* Include an example tor hidden service config, and systemd service file
for the server.
diff --git a/Tunables.hs b/Tunables.hs
index 0a317c5..d7e5ac7 100644
--- a/Tunables.hs
+++ b/Tunables.hs
@@ -93,7 +93,7 @@ defaultTunables = Tunables
{ nameGenerationHash = argon2 10000 (coreCost 2 (Seconds 600) d)
}
, keyEncryptionKeyTunable = KeyEncryptionKeyTunable
- { keyEncryptionKeyHash = argon2 2700 (CPUCost (Seconds 12) d)
+ { keyEncryptionKeyHash = argon2 169 (CPUCost (Seconds 12) d)
, randomSaltBytes = 1
-- The keyEncryptionKeyHash is run 256 times per
-- random salt byte to brute-force, and its parameters