From 27846f4db09c99fecdef972fe4a5fc41fd445500 Mon Sep 17 00:00:00 2001
From: Joe Crayne <joe@jerkface.net>
Date: Sun, 3 May 2020 23:00:47 -0400
Subject: Corrected tag ssh-host to ssh-server for ssh self-auth UID.

---
 kiki.hs        | 2 +-
 lib/KeyRing.hs | 3 ++-
 lib/Kiki.hs    | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kiki.hs b/kiki.hs
index a1727e7..bbe73f8 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -82,7 +82,7 @@ subkeysForDomain "onion" subs = do
         maybeToList $ derToBase32 <$> derRSA sub
 subkeysForDomain "ssh-rsa.cryptonomic.net" subs = do
         (code,(top,sub), kind, hashed,claimants) <- subs
-        guard ("ssh-host" `elem` kind)
+        guard ("ssh-server" `elem` kind)
         guard (code .&. 0x2 /= 0)
         RSAKey (MPI n) (MPI e) <- maybeToList $ rsaKeyFromPacket sub
         let blob = SSH.sshrsa e n
diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 5f43b4f..07badb6 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -51,6 +51,7 @@ import qualified Data.ByteString      as S
 import qualified Data.ByteString.Char8 as S8
 import Data.ByteArray.Encoding
 import qualified Codec.Compression.GZip as GZip
+import GHC.Stack
 import qualified System.Posix.Types as Posix
 import System.Posix.Files (setFileCreationMask, setFileTimes )
 import System.Posix.Files ( setFdTimesHiRes )
@@ -547,7 +548,7 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,IPsToWriteToHostsFile outg
 
 
 
-unconditionally :: IO (KikiCondition a) -> IO a
+unconditionally :: HasCallStack => IO (KikiCondition a) -> IO a
 unconditionally action = do
     r <- action
     case r of
diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index ddcaba0..02ac397 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -41,6 +41,7 @@ import qualified Data.ByteString.Char8      as S8
 import qualified Data.ByteString.Lazy       as L
 import qualified Data.ByteString.Lazy.Char8 as Char8
 import qualified Data.Map.Strict            as Map
+import           GHC.Stack
 import           Network.Socket
 import qualified SSHKey                     as SSH
 
@@ -539,7 +540,7 @@ refreshCache rt rootdir = do
     rt'' <- rethrowKikiErrors rt'
     writePublicKeyFiles rt'' fw myId
 
-rethrowKikiErrors :: KikiCondition a -> IO a
+rethrowKikiErrors :: HasCallStack => KikiCondition a -> IO a
 rethrowKikiErrors BadPassphrase =
   error "Operation requires correct passphrase. (Hint: Use --passphrase-fd=0 to input it on stdin.)"
 rethrowKikiErrors rt = unconditionally $ return rt
-- 
cgit v1.2.3