3 files changed, 31 insertions, 10 deletions

diff --git a/KnownHosts.hs b/KnownHosts.hs
index a8f4fe3..e04ad90 100644
--- a/KnownHosts.hs
+++ b/KnownHosts.hs
@@ -11,6 +11,7 @@ data KnownHostsEntry = KnownHostsEntry
     , eSp :: [L.ByteString]
     , eComment :: L.ByteString
     , eKeyBlob :: L.ByteString
+    , eKey :: Maybe SSH.Key
     , eKeyHeader :: L.ByteString
     , eHosts :: [L.ByteString]
     }
@@ -20,12 +21,15 @@ serializeLine :: KnownHostsEntry -> L.ByteString
 serializeLine (KnownHostsEntry { eSp = sp
                                , eComment = comment
                                , eKeyHeader = hdr
-                               , eKeyBlob = key
+                               , eKeyBlob = blob
+                               , eKey = _
                                , eHosts = hosts
                                })
-    = L.concat $ zipWith L.append [host,hdr,key] (take 3 sp) ++ [comment]
+    = L.concat $ zipWith L.append [host,hdr,blob] (take 3 sp) ++ [comment]
+    -- = L.concat $ zipWith L.append [host,hdr,keyblob] (take 3 sp) ++ [comment]
  where
     host = L.intercalate "," hosts
+    -- keyblob = L.dropWhile isSpace $ L.dropWhile (not . isSpace) $ SSH.keyblob key
     
 
 parseLine :: Int -> L.ByteString -> KnownHostsEntry
@@ -34,7 +38,8 @@ parseLine num str = KnownHostsEntry
     , eSp = sp
     , eComment = comment
     , eKeyHeader = hdr
-    , eKeyBlob = key
+    , eKeyBlob = blob
+    , eKey = key
     , eHosts = hosts
     }
  where
@@ -47,6 +52,23 @@ parseLine num str = KnownHostsEntry
         h0 <- take 1 hs
         h0 : hs'
     hdr = L.concat $ take 1 (drop 1 ns)
-    key = L.concat $ take 1 (drop 2 ns)
+    blob = L.concat $ take 1 (drop 2 ns)
+    key = SSH.blobkey $ L.concat $ hdr:" ":blob:[]
     comment = L.concat $ zipWith L.append (drop 3 ns) (drop 3 sp ++ repeat "")
 
+data KnownHosts = KnownHosts
+    { khcount :: Int
+    , khentries :: [KnownHostsEntry]
+    }
+
+decode :: L.ByteString -> KnownHosts
+decode input = renum $ foldr grok (KnownHosts 0 []) ls
+ where
+    ls = L.lines input
+    grok x (KnownHosts cnt es) =
+        KnownHosts (cnt+1) (parseLine 0 x:es)
+    renum kh = kh { khentries = zipWith setnum [1..] (khentries kh) }
+        where setnum n e = e { eLineno=n }
+
+encode :: KnownHosts -> L.ByteString
+encode kh = L.unlines $ map serializeLine (khentries kh)
diff --git a/SSHKey.hs b/SSHKey.hs
index 6e92e43..488f55f 100644
--- a/SSHKey.hs
+++ b/SSHKey.hs
@@ -8,7 +8,7 @@ import Data.Binary.Get ( runGet )
 import Data.Binary.Put ( putWord32be, runPut, putByteString )
 import Data.Binary     ( get, put )
 import Data.Monoid     ( (<>) )
-import Data.Maybe      ( fromMaybe, listToMaybe )
+import Data.Maybe      ( listToMaybe )
 import Data.Char       ( isSpace )
 import Control.Monad   ( guard )
 import LengthPrefixedBE
@@ -28,8 +28,8 @@ keyblob (n,e) = "ssh-rsa " <> blob
         put (LengthPrefixedBE e)
         put (LengthPrefixedBE n)
 
-blobkey :: L8.ByteString -> Key
-blobkey bs = fromMaybe er $ do
+blobkey :: L8.ByteString -> Maybe Key
+blobkey bs = do
     let (pre,bs1) = L8.splitAt 7 bs
     guard $ pre == "ssh-rsa"
     let (sp,bs2) = L8.span isSpace bs1
@@ -38,8 +38,6 @@ blobkey bs = fromMaybe er $ do
     qq <- L.pack `fmap` Base64.decode (L8.unpack bs3)
     decode_sshrsa qq
  where
-    er = error "Unsupported key format"
-
     decode_sshrsa :: L8.ByteString -> Maybe Key
     decode_sshrsa bs = do
         let (pre,bs1) = L8.splitAt 11 bs
diff --git a/kiki.hs b/kiki.hs
index 98ac4c7..c00ab84 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -224,7 +224,8 @@ modifyUID other              = other
 readPublicKey :: Char8.ByteString -> RSAPublicKey
 readPublicKey bs = RSAKey (MPI n) (MPI e)
  where
-    (n,e) = SSH.blobkey bs
+    (n,e) = fromMaybe (error "Unsupported key format")
+                $ SSH.blobkey bs
 
 -- | Returns the given list with its last element modified.
 toLast :: (x -> x) -> [x] -> [x]