summaryrefslogtreecommitdiffhomepage
path: root/Storage.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-10-06 15:37:12 -0400
committerJoey Hess <joeyh@joeyh.name>2016-10-06 16:10:18 -0400
commitf17abaa8ec3654ab4973641e2f551fe5b7088671 (patch)
tree5e0a692a0c21187b2cdfca5a35fea5575faa5f22 /Storage.hs
parenteeda326eb9aa34ff325bc9d2d97f5cb42f3958b5 (diff)
downloadkeysafe-f17abaa8ec3654ab4973641e2f551fe5b7088671.tar.gz
Gpg keyid bugs
Fix bugs with entry of gpg keyid in the keysafe.log. Gpg.anyKey was being used in writing the log, which made the log contain gpg keys with an empty keyid. Fix bug in --autostart that caused the full gpg keyid to be used in the name, so restores would only work when --gpgkeyid was specifid. Added a Distinguisher data type rather than the Gpg.anyKey hack. This commit was sponsored by Thom May on Patreon.
Diffstat (limited to 'Storage.hs')
-rw-r--r--Storage.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Storage.hs b/Storage.hs
index 428dc6f..5ad1408 100644
--- a/Storage.hs
+++ b/Storage.hs
@@ -176,7 +176,7 @@ storeChaff hn port delayseconds = forever $ do
-- the randomname is not something that can be feasibly guessed.
-- Prefix "random chaff" to the name to avoid ever using a name
-- that a real user might want to use.
- let sis = shareIdents testModeTunables (Name $ "random chaff:" <> randomname) (KeyFile "random")
+ let sis = shareIdents testModeTunables (Name $ "random chaff:" <> randomname) AnyGpgKey
mapConcurrently (go sis rng')
[1..totalObjects (shareParams testModeTunables)]
where