- key = /ssh-rsa [A-Za-z0-9+\/]+/.match(self.public_key)
-
- if not key
- errors.add(:public_key, "does not appear to be a valid ssh-rsa key")
+ #key = /^ssh-(rsa|dss) [A-Za-z0-9+\/=\+]+\b/.match(self.public_key)
+ valid_key = SSHKey.valid_ssh_public_key? self.public_key
+
+ if not valid_key
+ errors.add(:public_key, "does not appear to be a valid ssh-rsa or dsa public key")