summaryrefslogtreecommitdiff
path: root/Assistant/Ssh.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-22 11:18:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-22 11:18:19 -0400
commitaec14e8e2e1b69a8fc37f509b6d3a36b2cde1736 (patch)
tree71faf0e3cc1dfd14146190bfbb6ddbdb85456fc1 /Assistant/Ssh.hs
parent8d949fc465a3799b9d8b468d46a0c0fb4992c05a (diff)
webapp: Allow dashes in ssh key comments when pairing.
Diffstat (limited to 'Assistant/Ssh.hs')
-rw-r--r--Assistant/Ssh.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs
index 1d1f99176..0d3ebcfac 100644
--- a/Assistant/Ssh.hs
+++ b/Assistant/Ssh.hs
@@ -114,7 +114,7 @@ validateSshPubKey pubkey = either error return $ check $ words pubkey
(ssh, keytype) = separate (== '-') prefix
checkcomment comment
- | all (\c -> isAlphaNum c || c == '@') comment = ok
+ | all (\c -> isAlphaNum c || c == '@' || c == '-' || c == '_') comment = ok
| otherwise = err "bad comment in ssh public key"
addAuthorizedKeys :: Bool -> SshPubKey -> IO Bool