summaryrefslogtreecommitdiffhomepage
path: root/Hash.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-05-04 14:02:37 -0400
committerJoey Hess <joeyh@joeyh.name>2017-05-04 14:02:37 -0400
commit0aebedadd392e495ffc8f7c2fa74d712f16c2d7d (patch)
tree8f6af2ccc4e9bc4526ea8b8bf09bdfda327d9fdb /Hash.hs
parent2cd4c53ece2d935b044c65802824810eb712b1c2 (diff)
downloaddebug-me-0aebedadd392e495ffc8f7c2fa74d712f16c2d7d.tar.gz
include gpg public key export in GpgSigned
This makes debug-me not rely on the gpg keyservers at all. Before, it was only working when the user had the developer's public key already. I thought that --verify would download from --keyserver, but seems not. This is a protocol breaking change! Luckily done before any release, so ok. ProtocolBuffers renumbered. This commit was sponsored by Denis Dzyubenko on Patreon.
Diffstat (limited to 'Hash.hs')
-rw-r--r--Hash.hs6
1 files changed, 5 insertions, 1 deletions
diff --git a/Hash.hs b/Hash.hs
index bf8e166..6fb5614 100644
--- a/Hash.hs
+++ b/Hash.hs
@@ -68,8 +68,12 @@ instance Hashable PublicKey where
instance Hashable GpgSig where
hash (GpgSig v) = hash $ Tagged "GpgSig" v
+instance Hashable GpgKeyExport where
+ hash (GpgKeyExport v) = hash $ Tagged "GpgKeyExport" v
+
instance Hashable a => Hashable (PerhapsSigned a) where
- hash (GpgSigned a sig) = hash $ Tagged "GpgSigned" [hash a, hash sig]
+ hash (GpgSigned a sig export) = hash $
+ Tagged "GpgSigned" [hash a, hash sig, hash export]
hash (UnSigned a) = hash $ Tagged "UnSigned" a
instance Hashable ElapsedTime where