diff options
author | Joe Crayne <joe@jerkface.net> | 2020-05-03 23:00:47 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2020-05-03 23:02:56 -0400 |
commit | 27846f4db09c99fecdef972fe4a5fc41fd445500 (patch) | |
tree | d01dd3ad0d0e8cfc8e47e371028f8fe5802b83b7 | |
parent | 7920977b5cadd936756865bceb39758f10e46346 (diff) |
Corrected tag ssh-host to ssh-server for ssh self-auth UID.
-rw-r--r-- | kiki.hs | 2 | ||||
-rw-r--r-- | lib/KeyRing.hs | 3 | ||||
-rw-r--r-- | lib/Kiki.hs | 3 |
3 files changed, 5 insertions, 3 deletions
@@ -82,7 +82,7 @@ subkeysForDomain "onion" subs = do | |||
82 | maybeToList $ derToBase32 <$> derRSA sub | 82 | maybeToList $ derToBase32 <$> derRSA sub |
83 | subkeysForDomain "ssh-rsa.cryptonomic.net" subs = do | 83 | subkeysForDomain "ssh-rsa.cryptonomic.net" subs = do |
84 | (code,(top,sub), kind, hashed,claimants) <- subs | 84 | (code,(top,sub), kind, hashed,claimants) <- subs |
85 | guard ("ssh-host" `elem` kind) | 85 | guard ("ssh-server" `elem` kind) |
86 | guard (code .&. 0x2 /= 0) | 86 | guard (code .&. 0x2 /= 0) |
87 | RSAKey (MPI n) (MPI e) <- maybeToList $ rsaKeyFromPacket sub | 87 | RSAKey (MPI n) (MPI e) <- maybeToList $ rsaKeyFromPacket sub |
88 | let blob = SSH.sshrsa e n | 88 | 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 | |||
51 | import qualified Data.ByteString.Char8 as S8 | 51 | import qualified Data.ByteString.Char8 as S8 |
52 | import Data.ByteArray.Encoding | 52 | import Data.ByteArray.Encoding |
53 | import qualified Codec.Compression.GZip as GZip | 53 | import qualified Codec.Compression.GZip as GZip |
54 | import GHC.Stack | ||
54 | import qualified System.Posix.Types as Posix | 55 | import qualified System.Posix.Types as Posix |
55 | import System.Posix.Files (setFileCreationMask, setFileTimes ) | 56 | import System.Posix.Files (setFileCreationMask, setFileTimes ) |
56 | import System.Posix.Files ( setFdTimesHiRes ) | 57 | import System.Posix.Files ( setFdTimesHiRes ) |
@@ -547,7 +548,7 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,IPsToWriteToHostsFile outg | |||
547 | 548 | ||
548 | 549 | ||
549 | 550 | ||
550 | unconditionally :: IO (KikiCondition a) -> IO a | 551 | unconditionally :: HasCallStack => IO (KikiCondition a) -> IO a |
551 | unconditionally action = do | 552 | unconditionally action = do |
552 | r <- action | 553 | r <- action |
553 | case r of | 554 | 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 | |||
41 | import qualified Data.ByteString.Lazy as L | 41 | import qualified Data.ByteString.Lazy as L |
42 | import qualified Data.ByteString.Lazy.Char8 as Char8 | 42 | import qualified Data.ByteString.Lazy.Char8 as Char8 |
43 | import qualified Data.Map.Strict as Map | 43 | import qualified Data.Map.Strict as Map |
44 | import GHC.Stack | ||
44 | import Network.Socket | 45 | import Network.Socket |
45 | import qualified SSHKey as SSH | 46 | import qualified SSHKey as SSH |
46 | 47 | ||
@@ -539,7 +540,7 @@ refreshCache rt rootdir = do | |||
539 | rt'' <- rethrowKikiErrors rt' | 540 | rt'' <- rethrowKikiErrors rt' |
540 | writePublicKeyFiles rt'' fw myId | 541 | writePublicKeyFiles rt'' fw myId |
541 | 542 | ||
542 | rethrowKikiErrors :: KikiCondition a -> IO a | 543 | rethrowKikiErrors :: HasCallStack => KikiCondition a -> IO a |
543 | rethrowKikiErrors BadPassphrase = | 544 | rethrowKikiErrors BadPassphrase = |
544 | error "Operation requires correct passphrase. (Hint: Use --passphrase-fd=0 to input it on stdin.)" | 545 | error "Operation requires correct passphrase. (Hint: Use --passphrase-fd=0 to input it on stdin.)" |
545 | rethrowKikiErrors rt = unconditionally $ return rt | 546 | rethrowKikiErrors rt = unconditionally $ return rt |