summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2013-12-18 03:38:09 -0500
committerjoe <joe@jerkface.net>2013-12-18 03:48:13 -0500
commit782519d3d132add4356699eb1429fd9d06969b08 (patch)
tree924d57deae2f0e461c8ec964417e1b60a7bdb2de
parentde42e2f46ec64f84317ef3696bd304a3836a38f9 (diff)
No private key data on command line.
Conflicts: kiki.hs
-rw-r--r--kiki.hs4
1 files changed, 4 insertions, 0 deletions
diff --git a/kiki.hs b/kiki.hs
index 7c77f64..196d080 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1636,9 +1636,13 @@ main = do
1636 , ("--show-wk",0) 1636 , ("--show-wk",0)
1637 , ("--show-all",0) 1637 , ("--show-all",0)
1638 , ("--show-pem",1) 1638 , ("--show-pem",1)
1639 , ("--show-wip",1)
1639 , ("--help",0) 1640 , ("--help",0)
1640 ] 1641 ]
1641 argspec = map fst sargspec ++ ["--keyrings","--keypairs"] 1642 argspec = map fst sargspec ++ ["--keyrings","--keypairs"]
1643 -- "--bitcoin-keypairs"
1644 -- Disabled. We shouldn't accept private key
1645 -- data on the command line.
1642 args' = if map (take 1) (take 1 vargs) == ["-"] 1646 args' = if map (take 1) (take 1 vargs) == ["-"]
1643 then vargs 1647 then vargs
1644 else "--keyrings":vargs 1648 else "--keyrings":vargs