1 files changed, 4 insertions, 15 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 3da3565..5f43b4f 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -68,7 +68,7 @@ import Base58
 import FunctorToMaybe
 import DotLock
 import ProcessUtils (systemEnv, ExitCode(ExitFailure, ExitSuccess) )
-import           KeyRing.BuildKeyDB          (Hostnames(..),
+import           KeyRing.BuildKeyDB          (allNames', Hostnames,
                                               IPsToWriteToHostsFile(..),
                                               buildKeyDB,
                                               combineTransforms,
@@ -532,11 +532,7 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,IPsToWriteToHostsFile outg
 
     -- 3. add hostnames from gpg for addresses not in U
     let u = foldl' f u1 ans
-        ans = reverse $ do
-            Hostnames addr _ ns _ <- gpgnames
-            guard $ addr `elem` outgoing_names -- . null $ Hosts.namesForAddress addr u0
-            n <- ns
-            return (addr,n)
+        ans = reverse . filter ((`elem` outgoing_names) . fst) . concat $ allNames' <$> gpgnames
         f h (addr,n) = Hosts.assignNewName addr n h
 
     -- 4. for each host db H, union H with U and write it out as H'
@@ -796,8 +792,8 @@ subkeysForExport subspec (KeyData key _ _ subkeys) = do
 data PemType = PemPublicKey | PemPrivateKey | PemCertificate
 
 pemTypeString :: PemType -> String
-pemTypeString PemPublicKey  = "PUBLIC KEY"
-pemTypeString PemPrivateKey = "PRIVATE KEY"
+pemTypeString PemPublicKey   = "PUBLIC KEY"
+pemTypeString PemPrivateKey  = "RSA PRIVATE KEY"
 pemTypeString PemCertificate = "CERTIFICATE"
 
 writePEM :: PemType -> String -> String
@@ -1202,10 +1198,3 @@ getHomeDir protohome = do
                         where topair (x:xs) = (x,xs)
         return $ lookup "default-key" config >>= listToMaybe
 
-{-
-onionName :: KeyData -> (SockAddr,L.ByteString)
-onionName kd = (addr,name)
- where
-    (addr,(name:_,_)) = getHostnames kd
--}
-