summaryrefslogtreecommitdiffhomepage
path: root/Tunables.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-08-11 22:13:05 -0400
committerJoey Hess <joeyh@joeyh.name>2016-08-11 22:13:05 -0400
commit7db612b232a0f8a98fa695da6f14853284def681 (patch)
tree4c7c7b641f313c0bcf0106e19b4c42c73f41356f /Tunables.hs
parent73d1b3d2dfb0f225132ab31a701e6378422e2a37 (diff)
downloadkeysafe-7db612b232a0f8a98fa695da6f14853284def681.tar.gz
simplify by using the IV as the puzzle
Diffstat (limited to 'Tunables.hs')
-rw-r--r--Tunables.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Tunables.hs b/Tunables.hs
index 763f0bf..a2c5f52 100644
--- a/Tunables.hs
+++ b/Tunables.hs
@@ -59,7 +59,7 @@ data EncryptionTunable = UseAES256
deriving (Show)
-- | An additional puzzle that makes decryption more expensive.
-data DecryptionPuzzleTunable = KeyBlindingLeftSide (Cost DecryptionOp)
+data DecryptionPuzzleTunable = UsePuzzleIV (Cost DecryptionOp)
deriving (Show)
defaultTunables :: Tunables
@@ -73,7 +73,7 @@ defaultTunables = Tunables
-- This is set to only 1 minute because GPUs are quite a lot
-- faster than CPUs at AES, and so setting it higher would make
-- clients too slow at key recovery.
- , decryptionPuzzleTunable = KeyBlindingLeftSide (GPUCost (Seconds 60))
+ , decryptionPuzzleTunable = UsePuzzleIV (GPUCost (Seconds 60))
}
where
argonoptions = Argon2.HashOptions
@@ -95,7 +95,7 @@ testModeTunables = Tunables
, objectSize = 1024*64
, expensiveHashTunable = UseArgon2 weakargonoptions argoncost
, encryptionTunable = UseAES256
- , decryptionPuzzleTunable = KeyBlindingLeftSide (GPUCost (Seconds 60))
+ , decryptionPuzzleTunable = UsePuzzleIV (GPUCost (Seconds 1))
}
where
UseArgon2 argonoptions argoncost = expensiveHashTunable defaultTunables