diff options
author | Joe Crayne <joe@jerkface.net> | 2019-07-06 17:26:54 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2019-07-06 17:26:54 -0400 |
commit | b1ae1ecdc9d1f16134ea40b07a6cedcc26a94db8 (patch) | |
tree | b46ce0c50abb65fdff3a80f5f072b9010c05294e /lib/Transforms.hs | |
parent | ea924c53e6ecb2148747353ce34ae7b0ea416d8c (diff) |
Quiet down some of the warnings.
Diffstat (limited to 'lib/Transforms.hs')
-rw-r--r-- | lib/Transforms.hs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/Transforms.hs b/lib/Transforms.hs index 664cf86..adb7830 100644 --- a/lib/Transforms.hs +++ b/lib/Transforms.hs | |||
@@ -343,17 +343,16 @@ getBindings :: | |||
343 | -> | 343 | -> |
344 | ( [([Packet],[SignatureOver])] -- other signatures with key sets | 344 | ( [([Packet],[SignatureOver])] -- other signatures with key sets |
345 | -- that were used for the verifications | 345 | -- that were used for the verifications |
346 | , [(Word8, | 346 | , [(Word8, -- 1-master, 2-subkey, 0-other(see last element of tuple) |
347 | (Packet, Packet), -- (topkey,subkey) | 347 | (Packet, Packet), -- (topkey,subkey) |
348 | [String], -- usage flags | 348 | [String], -- usage flags |
349 | [SignatureSubpacket], -- hashed data | 349 | [SignatureSubpacket], -- hashed data |
350 | [Packet])] -- binding signatures | 350 | [Packet])] -- binding signatures |
351 | ) | 351 | ) |
352 | getBindings pkts = (sigs,bindings) | 352 | getBindings pkts = (sigs,bindings) |
353 | where | 353 | where |
354 | (sigs,concat->bindings) = unzip $ do | 354 | (sigs,concat->bindings) = unzip $ do |
355 | let (keys,_) = partition isKey pkts | 355 | keys <- disjoint_fp (filter isKey pkts) |
356 | keys <- disjoint_fp keys | ||
357 | let (bs,sigs) = verifyBindings keys pkts | 356 | let (bs,sigs) = verifyBindings keys pkts |
358 | return . ((keys,sigs),) $ do | 357 | return . ((keys,sigs),) $ do |
359 | b <- bs -- trace ("sigs = "++show (map (map signature_issuer . signatures_over) sigs)) bs | 358 | b <- bs -- trace ("sigs = "++show (map (map signature_issuer . signatures_over) sigs)) bs |
@@ -370,7 +369,7 @@ getBindings pkts = (sigs,bindings) | |||
370 | return (code,(topkey b,subkey b), kind, hashed,claimants) | 369 | return (code,(topkey b,subkey b), kind, hashed,claimants) |
371 | 370 | ||
372 | 371 | ||
373 | -- Returned data is simmilar to getBindings but the Word8 codes | 372 | -- Returned data is similar to getBindings but the Word8 codes |
374 | -- are ORed together. | 373 | -- are ORed together. |
375 | accBindings :: | 374 | accBindings :: |
376 | Bits t => | 375 | Bits t => |