diff options
author | Joey Hess <joey@kitenet.net> | 2012-09-10 15:20:18 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-09-10 15:21:34 -0400 |
commit | b573d91aa27a315fe9b155349a0a90805dc01181 (patch) | |
tree | 5ec983836c6ea1baa3ca5676eb295747f73d447a /Assistant/Pairing.hs | |
parent | 34a0e09d4be5ab9cc285dd7a3a72aea8460bdcdc (diff) |
broke out fairly generic ssh stuff to Assistant.Ssh so pairing can use it too
I'd rather Utility.Ssh, but the SshData type is not sufficiently clean and
generic for Utility.
Diffstat (limited to 'Assistant/Pairing.hs')
-rw-r--r-- | Assistant/Pairing.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs index c78deace0..399c7e50f 100644 --- a/Assistant/Pairing.hs +++ b/Assistant/Pairing.hs @@ -8,6 +8,7 @@ module Assistant.Pairing where import Utility.Verifiable +import Assistant.Ssh import Control.Concurrent import Network.Socket @@ -40,7 +41,7 @@ data PairData = PairData , remoteAddress :: SomeAddr , remoteUserName :: UserName , remoteDirectory :: FilePath - , sshPubKey :: SshPubKey + , remoteSshPubKey :: SshPubKey } deriving (Eq, Read, Show) @@ -52,6 +53,7 @@ type UserName = String data PairingInProgress = PairingInProgress { inProgressSecret :: Secret , inProgressThreadId :: ThreadId + , inProgressSshKeyPair :: SshKeyPair } data SomeAddr = IPv4Addr HostAddress | IPv6Addr HostAddress6 |