2 files changed, 28 insertions, 7 deletions

diff --git a/kiki.cabal b/kiki.cabal
index 8ce59a6..7bd661e 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -14,14 +14,13 @@ build-type:          Simple
 Executable kiki
     Main-is: kiki.hs
     Build-Depends:   base -any, cmdargs -any, directory -any,
-                     openpgp-crypto-api -any,
+                     openpgp-util -any,
                      crypto-pubkey (>=0.2.3), cryptohash -any,
                      crypto-pubkey-types -any,
                      asn1-types -any, asn1-encoding -any,
                      dataenc -any, text -any, pretty -any, pretty-show -any,
                      bytestring -any, openpgp (==0.6.1), binary -any,
                      unix, time, crypto-api, cryptocipher (>=0.3.7),
-                     containers -any, process -any, filepath -any,
-                     hecc -any
+                     containers -any, process -any, filepath -any
     ghc-options:     -O2
     c-sources: dotlock.c
diff --git a/kiki.hs b/kiki.hs
index edc36d6..0ecfa1c 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -72,9 +72,8 @@ import Data.Monoid ((<>))
 -- import Data.X509
 import qualified Data.Map as Map
 import DotLock
-import Codec.Crypto.ECC.Base -- hecc package
+-- import Codec.Crypto.ECC.Base -- hecc package
 import Text.Printf
-import Math.NumberTheory.Moduli
 import qualified CryptoCoins as CryptoCoins
 
 
@@ -961,7 +960,7 @@ data KeySpec =
       KeyGrip String
     | KeyTag Packet String
     | KeyUidMatch String
-
+ deriving Show
 
 is40digitHex xs = ys == xs && length ys==40
   where
@@ -1399,6 +1398,15 @@ show_pem keyspec wkgrip db = do
     putStrLn $
         writePEM "PUBLIC KEY" qq -- ("TODO "++show keyspec)
 
+show_key keyspec wkgrip db = do
+    let s = parseSpec "" keyspec
+    let ps = do 
+            (_,k) <- filterMatches (fst s) (Map.toList db)
+            mp <- flattenTop "" True k
+            return $ packet mp
+    -- putStrLn $ "show key " ++ show s
+    putStrLn $ listKeys ps
+
 show_wip keyspec wkgrip db = do
     let s = parseSpec wkgrip keyspec
     flip (maybe $ warn (keyspec ++ ": not found") >> return ())
@@ -1414,8 +1422,11 @@ parseSpec grip spec = (topspec,subspec)
      (toptyp,top) = unprefix ':' topspec0
      (subtyp,sub) = unprefix ':' subspec0
      topspec = case () of
-                    _ | null top && (subtyp=="fp" || (null subtyp && is40digitHex sub))
+                    _ | null top && or [ subtyp=="fp"
+                                       , null subtyp && is40digitHex sub
+                                       ]
                                  -> KeyGrip sub
+                    _ | null top && null grip -> KeyUidMatch sub
                     _ | null top -> KeyGrip grip
                     _ | toptyp=="fp" || (null toptyp && is40digitHex top)
                                  -> {- trace "using top" $ -} KeyGrip top
@@ -1533,6 +1544,7 @@ findTag tag wk subkey subsigs = (xs',minsig,ys')
                     isNotation _ = False
                 return (tag `elem` ks, sig)
 
+{-
 applyCurve curve x = x*x*x + x*a + b where (a,b)=(geta curve,getb curve)
 
 secp256k1_oid = [1,3,132,0,10]
@@ -1563,6 +1575,7 @@ secp256k1_G = ECPa secp256k1_curve
         G = 04 79BE667E F9DCBBAC 55A06295 CE870B07 029BFCDB 2DCE28D9 59F2815B 16F81798
                483ADA77 26A3C465 5DA4FBFC 0E1108A8 FD17B448 A6855419 9C47D08F FB10D4B8 
     -}
+-}
 
 base58chars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
 
@@ -1681,12 +1694,16 @@ decode_btc_key timestamp str = do
     (network_id,us) <- base58_decode str
     return . (network_id,) $ Message $ do
         let d = foldl' (\a b->a*256+b) 0 (map fromIntegral us :: [Integer])
+            {-
             xy = secp256k1_G `pmul` d
             x = getx xy
             y = gety xy
             -- y² = x³ + 7 (mod p)
             y' = sqrtModP' (applyCurve secp256k1_curve x) (getp secp256k1_curve)
             y'' = sqrtModPList (applyCurve secp256k1_curve x) (getp secp256k1_curve)
+            -}
+            secp256k1 = ECC.getCurveByName ECC.SEC_p256k1
+            ECC.Point x y = ECC.ecc_g $ ECC.common_curve secp256k1
             pub = cannonical_eckey x y
             hash = S.cons network_id . RIPEMD160.hash . SHA256.hash . S.pack $  pub
             address = base58_encode hash
@@ -1981,6 +1998,9 @@ kiki_usage = do
         ,"     --show-wk  Show fingerprints for the working key (which will be used to"
         ,"                make signatures) and all its subkeys and UID."
         ,""
+        ,"     --show-key Show fingerprints for the specified key and all its subkeys"
+        ,"                and UID."
+        ,""
         ,"     --show-all Show fingerprints and UIDs and usage tags for all known keys."
         ,""
         ,"     --show-pem SPEC"
@@ -2022,6 +2042,7 @@ main = do
                                      , ("--autosign",0)
                                      , ("--show-wk",0)
                                      , ("--show-all",0)
+                                     , ("--show-key",1)
                                      , ("--show-pem",1)
                                      , ("--show-wip",1)
                                      , ("--help",0)
@@ -2195,6 +2216,7 @@ main = do
             -- On last pass, interpret --show-* commands.
             let shspec = Map.fromList [("--show-wk", const $ show_wk secfile grip)
                                       ,("--show-all",const $ show_all)
+                                      ,("--show-key",\[x] -> show_key x $ maybe "" id grip)
                                       ,("--show-pem",\[x] -> show_pem x $ maybe "" id grip)
                                       ,("--show-wip",\[x] -> show_wip x $ maybe "" id grip)
                                       ,("--help", \_ _ ->kiki_usage)]