From 1c86069858c76eebefe0644a14e94e19f18b88da Mon Sep 17 00:00:00 2001 From: joe Date: Mon, 21 Apr 2014 21:51:06 -0400 Subject: more type sigs --- KeyRing.hs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/KeyRing.hs b/KeyRing.hs index e57861f..58868b6 100644 --- a/KeyRing.hs +++ b/KeyRing.hs @@ -1151,6 +1151,7 @@ isCryptoCoinKey p = , lookup 'c' (key p) == Just (MPI secp256k1_id) ] +getCryptoCoinTag :: Packet -> Maybe CryptoCoins.CoinNetwork getCryptoCoinTag p | isSignaturePacket p = do -- CryptoCoins.secret let sps = hashed_subpackets p ++ unhashed_subpackets p @@ -1170,6 +1171,7 @@ coinKeysOwnedBy db wk = do tag <- take 1 $ mapMaybe getCryptoCoinTag (map (packet . fst) sigs) return (tag,mp) +walletImportFormat :: Word8 -> Packet -> String walletImportFormat idbyte k = secret_base58_foo where -- isSecret (SecretKeyPacket {}) = True @@ -1206,6 +1208,7 @@ writeWalletKeys krd db wk = do report <- foldM writeWallet [] (files isMutableWallet) return $ KikiSuccess report +ifSecret :: Packet -> t -> t -> t ifSecret (SecretKeyPacket {}) t f = t ifSecret _ t f = f @@ -1219,8 +1222,13 @@ showPacket p | isKey p = (if is_subkey p showPacket0 p = concat . take 1 $ words (show p) +importPublic :: Maybe Bool importPublic = Just True + +importSecret :: Maybe Bool importSecret = Just False + +subkeysOnly :: Maybe Bool subkeysOnly = Nothing guardAuthentic :: KeyRingRuntime -> KeyData -> Maybe () @@ -1299,6 +1307,7 @@ getSubkeysForExport kk subspec db = do subkeysForExport subspec kd -} +subkeysForExport :: Maybe String -> KeyData -> [MappedPacket] subkeysForExport subspec (KeyData key _ _ subkeys) = do let subs tag = do e <- Map.elems subkeys @@ -1313,6 +1322,7 @@ subkeysForExport subspec (KeyData key _ _ subkeys) = do sigtrusts in fmap fst v==Just True +writePEM :: String -> String -> String writePEM typ dta = pem where pem = unlines . concat $ @@ -1354,6 +1364,8 @@ rsaPrivateKeyFromPacket pkt@(SecretKeyPacket {}) = do rsaPrivateKeyFromPacket _ = Nothing +writeKeyToFile :: + Bool -> String -> FilePath -> Packet -> IO [(FilePath, KikiReportAction)] writeKeyToFile False "PEM" fname packet = case key_algorithm packet of RSA -> do -- cgit v1.2.3