summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2013-10-31 00:44:52 -0400
committerjoe <joe@jerkface.net>2013-10-31 00:44:52 -0400
commit467ec8e58ca8b13074ac64ab85cd9e84c492f167 (patch)
tree767869d1fa3ceae8c0ff1f1725cb2963de4ec3e4
parentb82eaca1a2069f5c1981cdebb71538b344021eb7 (diff)
Reduce claimants: debug print
-rw-r--r--keys.hs15
1 files changed, 14 insertions, 1 deletions
diff --git a/keys.hs b/keys.hs
index f8f1e2b..3ce3980 100644
--- a/keys.hs
+++ b/keys.hs
@@ -380,7 +380,9 @@ listKeysFiltered grips pkts = do
380 -- torhash = maybe "" id $ derToBase32 <$> derRSA sub 380 -- torhash = maybe "" id $ derToBase32 <$> derRSA sub
381 concat [ " " 381 concat [ " "
382 -- , grip top 382 -- , grip top
383 , (if not (null claimants) then trace ("claimants: "++show claimants) else id) ar 383 , (if not (null claimants)
384 then trace ("claimants: "++show (map fingerprint claimants))
385 else id) ar
384 , formkind 386 , formkind
385 , " " 387 , " "
386 , fingerprint sub 388 , fingerprint sub
@@ -733,6 +735,8 @@ data Arguments =
733 , output :: FilePath } 735 , output :: FilePath }
734 | PemFP { homedir :: Maybe FilePath 736 | PemFP { homedir :: Maybe FilePath
735 , seckey :: String } 737 , seckey :: String }
738 | CatPub { homedir :: Maybe FilePath
739 , catpub_args :: [String] }
736 {- 740 {-
737 | Decrypt { homedir :: Maybe FilePath 741 | Decrypt { homedir :: Maybe FilePath
738 , passphrase_fd :: Maybe Int 742 , passphrase_fd :: Maybe Int
@@ -782,6 +786,9 @@ main = do
782 [ "Remove password protection from the working keyring" 786 [ "Remove password protection from the working keyring"
783 , " and save the result into the given file."] 787 , " and save the result into the given file."]
784 -} 788 -}
789 , CatPub HOMEOPTION
790 (def &= args &= typ "KEYSPEC FILES")
791 &= help "Extract a public subkey to stdout."
785 , Add HOMEOPTION 792 , Add HOMEOPTION
786 (def &= opt ("passphrase"::String) 793 (def &= opt ("passphrase"::String)
787 &= typ "FD" 794 &= typ "FD"
@@ -1023,6 +1030,12 @@ main = do
1023 -} 1030 -}
1024 -} 1031 -}
1025 1032
1033 doCmd cmd@(CatPub {}) = do
1034 let spec:files = catpub_args cmd
1035 putStrLn $ "spec = " ++show spec
1036 putStrLn $ "files = " ++ show files
1037 return ()
1038
1026 doCmd cmd@(Add {}) = do 1039 doCmd cmd@(Add {}) = do
1027 ( homedir -- e3ozbhvej4jvlu43.onion/gpg/gnupghome 1040 ( homedir -- e3ozbhvej4jvlu43.onion/gpg/gnupghome
1028 , sec -- e3ozbhvej4jvlu43.onion/gpg/gnupghome/secring.gpg 1041 , sec -- e3ozbhvej4jvlu43.onion/gpg/gnupghome/secring.gpg