diff options
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1417,7 +1417,7 @@ doImport doDecrypt db (fname,subspec,ms,_) = do | |||
1417 | SHA1 | 1417 | SHA1 |
1418 | (fingerprint wkun) | 1418 | (fingerprint wkun) |
1419 | flip (maybe $ warn "Failed to make signature" >> return uids) | 1419 | flip (maybe $ warn "Failed to make signature" >> return uids) |
1420 | (listToMaybe $ signatures_over sig_ov) | 1420 | (sig_ov >>= listToMaybe . signatures_over) |
1421 | $ \sig -> do | 1421 | $ \sig -> do |
1422 | let om = Map.singleton fname (origin sig (-1)) | 1422 | let om = Map.singleton fname (origin sig (-1)) |
1423 | trust = Map.empty | 1423 | trust = Map.empty |
@@ -1449,7 +1449,7 @@ makeSig doDecrypt top fname subkey_p tag mbsig = do | |||
1449 | let grip = fingerprint wk | 1449 | let grip = fingerprint wk |
1450 | addOrigin new_sig = do | 1450 | addOrigin new_sig = do |
1451 | flip (maybe $ error "Failed to make signature.") | 1451 | flip (maybe $ error "Failed to make signature.") |
1452 | (listToMaybe $ signatures_over new_sig) | 1452 | (new_sig >>= listToMaybe . signatures_over) |
1453 | $ \new_sig -> do | 1453 | $ \new_sig -> do |
1454 | let mp' = MappedPacket new_sig (Map.singleton fname (origin new_sig (-1))) | 1454 | let mp' = MappedPacket new_sig (Map.singleton fname (origin new_sig (-1))) |
1455 | return (mp', Map.empty) | 1455 | return (mp', Map.empty) |
@@ -1481,8 +1481,9 @@ makeSig doDecrypt top fname subkey_p tag mbsig = do | |||
1481 | [IssuerPacket subgrip])) | 1481 | [IssuerPacket subgrip])) |
1482 | SHA1 | 1482 | SHA1 |
1483 | subgrip | 1483 | subgrip |
1484 | let unhashed0 = ( IssuerPacket (fingerprint wk) | 1484 | let iss = IssuerPacket (fingerprint wk) |
1485 | : map EmbeddedSignaturePacket (signatures_over back_sig)) | 1485 | cons_iss back_sig = iss : map EmbeddedSignaturePacket (signatures_over back_sig) |
1486 | unhashed0 = maybe [iss] cons_iss back_sig | ||
1486 | 1487 | ||
1487 | new_sig <- pgpSign (Message [wkun]) | 1488 | new_sig <- pgpSign (Message [wkun]) |
1488 | (SubkeySignature wk | 1489 | (SubkeySignature wk |
@@ -1927,6 +1928,7 @@ main = do | |||
1927 | . keykey)) | 1928 | . keykey)) |
1928 | vs | 1929 | vs |
1929 | additional new_sig = do | 1930 | additional new_sig = do |
1931 | new_sig <- maybeToList new_sig | ||
1930 | guard $ {- trace (unlines $ [ "selfsigs = "++show (map ((\(_,_,k)->fingerprint k)) selfsigs) | 1932 | guard $ {- trace (unlines $ [ "selfsigs = "++show (map ((\(_,_,k)->fingerprint k)) selfsigs) |
1931 | , " for mainkey = "++fingerprint mainpubkey] ) | 1933 | , " for mainkey = "++fingerprint mainpubkey] ) |
1932 | -} | 1934 | -} |