From 924ce0d71c3588e8c020a28ced9e5a0923a8da98 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Tue, 19 May 2020 11:57:13 -0400 Subject: TODO: Comments (we aren't setting hash_head correctly). --- Data/OpenPGP/Util/Sign.hs | 4 +++- Data/OpenPGP/Util/Verify.hs | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Data/OpenPGP/Util/Sign.hs b/Data/OpenPGP/Util/Sign.hs index a074dcb..1af6053 100644 --- a/Data/OpenPGP/Util/Sign.hs +++ b/Data/OpenPGP/Util/Sign.hs @@ -76,6 +76,8 @@ xed25519Sign cv25519key hsh dta = do -- In order to set more options on a signature, pass in a signature packet. -- Operation is unsafe in that it silently re-uses "random" bytes when -- entropy runs out. Use pgpSign for a safer interface. +-- +-- TODO: Produce hash_head field. unsafeSign :: (RG g) => -- CryptoRandomGen g) => OpenPGP.Message -- ^ SecretKeys, one of which will be used -> OpenPGP.SignatureOver -- ^ Data to sign, and optional signature packet @@ -129,7 +131,7 @@ unsafeSign keys over hsh keyid timestamp g = (over {OpenPGP.signatures_over = [s hsh -- force hash algorithm (OpenPGP.hashed_subpackets s) (OpenPGP.unhashed_subpackets s) - (OpenPGP.hash_head s) + (OpenPGP.hash_head s) -- FIXME: This is not right. (map OpenPGP.MPI final) findSigOrDefault Nothing = OpenPGP.signaturePacket 4 diff --git a/Data/OpenPGP/Util/Verify.hs b/Data/OpenPGP/Util/Verify.hs index 52e9005..359e116 100644 --- a/Data/OpenPGP/Util/Verify.hs +++ b/Data/OpenPGP/Util/Verify.hs @@ -49,6 +49,7 @@ verify keys over = sigs = map (\s -> (s, LZ.toStrict $ encode over `LZ.append` OpenPGP.trailer s)) (OpenPGP.signatures_over over) +-- TODO: Check hash_head field? verifyOne :: OpenPGP.Message -> OpenPGP.Packet -> BS.ByteString -> Maybe OpenPGP.Packet verifyOne keys sig over = fmap (const sig) $ maybeKey >>= verification >>= guard where -- cgit v1.2.3