From 802c204c3202df3a3340ea0479cc11a34cd8a042 Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 16 Jan 2014 16:51:24 -0500 Subject: Removed unused bindings. --- kiki.cabal | 2 +- kiki.hs | 55 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/kiki.cabal b/kiki.cabal index cf0e518..7edf6cd 100644 --- a/kiki.cabal +++ b/kiki.cabal @@ -23,5 +23,5 @@ Executable kiki unix, time, containers -any, process -any, filepath -any, network - ghc-options: -O2 + ghc-options: -O2 -fwarn-unused-binds c-sources: dotlock.c diff --git a/kiki.hs b/kiki.hs index a71ed28..dab3d2c 100644 --- a/kiki.hs +++ b/kiki.hs @@ -230,7 +230,6 @@ sshrsa e n = runPut $ do decode_sshrsa :: Char8.ByteString -> Maybe RSAPublicKey decode_sshrsa bs = do let (pre,bs1) = Char8.splitAt 11 bs - v = runPut (putWord32be 7 >> putByteString "ssh-rsa") guard $ pre == runPut (putWord32be 7 >> putByteString "ssh-rsa") let rsakey = flip runGet bs1 $ do LengthPrefixedBE e <- get @@ -429,7 +428,7 @@ getBindings :: getBindings pkts = (sigs,bindings) where (sigs,concat->bindings) = unzip $ do - let (keys,nonkeys) = partition isKey pkts + let (keys,_) = partition isKey pkts keys <- disjoint_fp keys let (bs,sigs) = verifyBindings keys pkts return . ((keys,sigs),) $ do @@ -530,9 +529,8 @@ listKeysFiltered grips pkts = do matchgrip _ = False gs = filter matchgrip $ groupBy sameMaster (sortBy (comparing code) as) showsigs claimants = map (\k -> " " ++ "^ signed: " ++ fingerprint k) claimants - subs <- gs - let (code,(top,sub), kind, hashed,claimants):_ = subs - subkeys = do + subs@((_,(top,_),_,_,_):_) <- gs + let subkeys = do (code,(top,sub), kind, hashed,claimants) <- subs let ar = case code of 0 -> " ??? " @@ -540,7 +538,7 @@ listKeysFiltered grips pkts = do 2 -> " <-- " 3 -> " <-> " formkind = take kindcol $ defaultkind kind hashed ++ repeat ' ' - torhash = maybe "" id $ derToBase32 <$> derRSA sub + -- torhash = maybe "" id $ derToBase32 <$> derRSA sub (netid,kind') = maybe (0x0,"bitcoin") (\n->(CryptoCoins.publicByteFromName n,n)) $ listToMaybe kind @@ -593,7 +591,7 @@ listKeysFiltered grips pkts = do listToMaybe $ filter match torkeys unlines $ [ " " ++ ar ++ "@" ++ " " ++ uid_full parsed ] ++ showsigs secondary - (_,sigs) = unzip certs + -- (_,sigs) = unzip certs "master-key " ++ fingerprint top ++ "\n" ++ uid ++" ...\n" ++ subkeys ++ "\n" @@ -696,7 +694,7 @@ readPacketsFromWallet wk fname = do timestamp <- handleIO_ (error $ fname++": modificaiton time?") $ modificationTime <$> getFileStatus fname input <- L.readFile fname - let (ks,junk) = slurpWIPKeys timestamp input + let (ks,_) = slurpWIPKeys timestamp input when (not (null ks)) $ do -- decrypt wk -- create sigs @@ -1369,7 +1367,7 @@ cross_merge doDecrypt grip0 keyrings wallets f = do forM_ wsns $ \(_,n) -> do let cs' = do (nw,mp) <- cs - let fns = Map.keys (locations mp) + -- let fns = Map.keys (locations mp) -- trace ("COIN KEY: "++show fns) $ return () guard . not $ Map.member n (locations mp) let wip = walletImportFormat (CryptoCoins.private_byte_id nw) (packet mp) @@ -1564,7 +1562,7 @@ doExport doDecrypt (db,use_db) (fname,subspec,ms,cmd) = return (Nothing,use_db) -- need another pass export = do let [kk] = ms - Just (KeyData key sigs uids subkeys) = Map.lookup kk use_db + Just (KeyData key _ _ subkeys) = Map.lookup kk use_db p = flip (maybe (Just $ packet key)) subspec $ \tag -> do let subs = Map.elems subkeys doSearch (SubKey sub_mp sigtrusts) = @@ -1674,11 +1672,11 @@ base58_decode str = do walletImportFormat idbyte k = secret_base58_foo where - isSecret (SecretKeyPacket {}) = True - isSecret _ = False + -- isSecret (SecretKeyPacket {}) = True + -- isSecret _ = False secret_base58_foo = base58_encode seckey Just d = lookup 'd' (key k) - (len16,bigendian) = S.splitAt 2 (S.concat $ L.toChunks $ encode d) + (_,bigendian) = S.splitAt 2 (S.concat $ L.toChunks $ encode d) seckey = S.cons idbyte bigendian @@ -1771,11 +1769,11 @@ decode_btc_key timestamp str = do -} 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 - pubstr = concatMap (printf "%02x") $ pub - _ = pubstr :: String + -- pub = cannonical_eckey x y + -- hash = S.cons network_id . RIPEMD160.hash . SHA256.hash . S.pack $ pub + -- address = base58_encode hash + -- pubstr = concatMap (printf "%02x") $ pub + -- _ = pubstr :: String return $ {- trace (unlines ["pub="++show pubstr ,"add="++show address ,"y ="++show y @@ -2104,7 +2102,7 @@ getHostnames (KeyData topmp _ uids subs) = (addr,(onames,othernames)) _ -> mzero addr = fingerdress topk - name = maybe "" id $ listToMaybe onames -- TODO: more than one tor key? + -- name = maybe "" id $ listToMaybe onames -- TODO: more than one tor key? topk = packet topmp torkeys = do SubKey k sigs <- Map.elems subs @@ -2129,7 +2127,7 @@ getHostnames (KeyData topmp _ uids subs) = (addr,(onames,othernames)) has_tag tag p = isSignaturePacket p && or [ tag `elem` mapMaybe usage (hashed_subpackets p) , tag `elem` map usageString (mapMaybe keyflags (hashed_subpackets p)) ] - subkeyPacket (SubKey k _ ) = k + -- subkeyPacket (SubKey k _ ) = k onames :: [L.ByteString] onames = map ( (<> ".onion") . Char8.pack @@ -2323,12 +2321,14 @@ main = do return $ if take 1 content =="=" then (spec,proto,drop 1 content) else (spec,"base58",proto) + {- publics = flip map (maybe [] id $ Map.lookup "--public" margs) $ \specfile -> do let (spec,efile) = break (=='=') specfile guard $ take 1 efile=="=" let file= drop 1 efile Just (spec,file) + -} keyrings_ = maybe [] id $ Map.lookup "--keyrings" margs wallets = maybe [] id $ Map.lookup "--wallets" margs passphrase_fd = concat <$> Map.lookup "--passphrase-fd" margs @@ -2413,7 +2413,7 @@ main = do let (imports,exports) = partition fst fs use_db <- foldM (doImport decrypt) use_db0 (map snd imports) - let (btcs,bad_btcs) = partition isSupportedBTC btcpairs + let (btcs,_) = partition isSupportedBTC btcpairs isSupportedBTC (spec,"base58",cnt) = True isSupportedBTC _ = False dblist = Map.toList use_db @@ -2475,7 +2475,7 @@ main = do -- we filter U to be only finger-dresses u1 = Hosts.filterAddrs (hasFingerDress db) u0 - let nf h = map Char8.unpack $ Hosts.namesForAddress (fromJust $ Hosts.inet_pton "fdf4:ed98:29c7:6226:9bde:a5b4:d564:3321") h + -- let nf h = map Char8.unpack $ Hosts.namesForAddress (fromJust $ Hosts.inet_pton "fdf4:ed98:29c7:6226:9bde:a5b4:d564:3321") h {- putStrLn $ "_ = {\n" ++ show (head hostdbs) ++ "}" putStrLn $ "--> " ++ show (nf (head hostdbs)) @@ -2566,7 +2566,6 @@ main = do getWorkingKey homedir = do let o = Nothing h = Just homedir - args = ["hi"] ofile <- fmap listToMaybe . flip (maybe (return [])) h $ \h -> let optfiles = map (second ((h++"/")++)) (maybe optfile_alts' (:[]) o') @@ -2597,6 +2596,7 @@ main = do let torhash = maybe "" id $ derToBase32 <$> derRSA sub return (top,(torhash,sub)) + {- uidScan pub = scanl (\(mkey,u) w -> case () of _ | isPublicMaster w -> (w,u) @@ -2607,6 +2607,7 @@ main = do ws where w0:ws = pub + -} signTorIds selfkey keys kd@(KeyData k ksigs umap submap) = do umap' <- Traversable.mapM signIfTor (Map.mapWithKey (,) umap) @@ -2659,7 +2660,7 @@ main = do (fingerprint wkun) return (additional new_sig) -- (uid:sigs,additional,xs'',g') where - (sigs, xs'') = span isSignaturePacket xs' + (sigs, _) = span isSignaturePacket xs' overs sig = signatures $ Message (keys++[mainpubkey,uid,sig]) vs :: [ ( Packet -- signature , Maybe SignatureOver -- Nothing means non-verified @@ -2689,8 +2690,9 @@ main = do -} (null $ selfsigs) signatures_over new_sig + {- modsig sig = sig { signature = map id (signature sig) } - where plus1 (MPI x) = MPI (x+1) + where plus1 (MPI x) = MPI (x+1) params newtop = public ++ map fst (key newtop) ++ "}" where public = case newtop of @@ -2711,6 +2713,7 @@ main = do ,"new_sig isSignaturePacket(over) = " ++ (show . map isSignaturePacket $ new_sig) ,"issuer = " ++ show (map signature_issuer new_sig) ]) + -} flgs = if keykey mainpubkey == keykey (fromJust selfkey) then keyFlags0 mainpubkey (map (\(x,_,_)->x) selfsigs) else [] @@ -3128,7 +3131,7 @@ newKey wkun wk parsedkey tag pre uids subkeys output_file grip = do groupBindings pub = - let (sigs,bindings) = getBindings pub + let (_,bindings) = getBindings pub bindings' = accBindings bindings code (c,(m,s),_,_,_) = (fingerprint_material m,-c) ownerkey (_,(a,_),_,_,_) = a -- cgit v1.2.3