saltstack/salt — pull request #4004 by dekkers (2013-03-08 14:19:18+00:00)
Title: Make ssh key regular expression more strict

The ssh key regular expression wasn't strict enough. The problem I had was that the "ssh-" part matched the option command="/usr/local/lib/ssh-helper". I fixed this by only allowing alphanumeric characters and - in the key type, so it won't match command options. I also added the command option to the test case.