pairing passphrase entry form, validation, etc

Actually 3 forms in one, this handles the initial passphrase entry, and the
confirmation, and also varys wording if the same user or a different user
is confirming.

1 files changed, 8 insertions, 2 deletions

diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs
index f384895bd..8a9d897eb 100644
--- a/Assistant/Pairing.hs
+++ b/Assistant/Pairing.hs
@@ -21,14 +21,20 @@ data PairReq = PairReq (Verifiable PairData)
 data PairAck = PairAck (Verifiable PairData)
 	deriving (Eq, Read, Show)
 
+fromPairReq :: PairReq -> Verifiable PairData
+fromPairReq (PairReq v) = v
+
+fromPairAck :: PairAck -> Verifiable PairData
+fromPairAck (PairAck v) = v
+
 data PairMsg
 	= PairReqM PairReq
 	| PairAckM PairAck
 	deriving (Eq, Read, Show)
 
 data PairData = PairData
-	{ hostName :: HostName
-	, userName :: UserName
+	{ remoteHostName :: HostName
+	, remoteUserName :: UserName
 	, sshPubKey :: Maybe SshPubKey
 	}
 	deriving (Eq, Read, Show)