summaryrefslogtreecommitdiff
path: root/Assistant/Pairing
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-05 17:43:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-05 17:43:17 -0400
commita4667e3e8cb7fae50b0c2cb8bc1a46df0b289b6c (patch)
tree9f75d066b025e99f7015818ccbe143d70b5bbae7 /Assistant/Pairing
parentdedc9790ef60b0965c0c34acd080ef8d4906e07a (diff)
finished XMPP pairing!
This includes keeping track of which buddies we're pairing with, to know which PairAck are legitimate.
Diffstat (limited to 'Assistant/Pairing')
-rw-r--r--Assistant/Pairing/MakeRemote.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Assistant/Pairing/MakeRemote.hs b/Assistant/Pairing/MakeRemote.hs
index dd15015a0..38f9981e5 100644
--- a/Assistant/Pairing/MakeRemote.hs
+++ b/Assistant/Pairing/MakeRemote.hs
@@ -26,10 +26,10 @@ setupAuthorizedKeys msg repodir = do
where
pubkey = remoteSshPubKey $ pairMsgData msg
-{- When pairing is complete, this is used to set up the remote for the host
- - we paired with. -}
-finishedPairing :: PairMsg -> SshKeyPair -> Assistant ()
-finishedPairing msg keypair = do
+{- When local pairing is complete, this is used to set up the remote for
+ - the host we paired with. -}
+finishedLocalPairing :: PairMsg -> SshKeyPair -> Assistant ()
+finishedLocalPairing msg keypair = do
sshdata <- liftIO $ setupSshKeyPair keypair =<< pairMsgToSshData msg
{- Ensure that we know the ssh host key for the host we paired with.
- If we don't, ssh over to get it. -}