Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for SSH2 and OpenSSH public keys #2346

Merged
merged 2 commits into from
Apr 21, 2015
Merged

Add support for SSH2 and OpenSSH public keys #2346

merged 2 commits into from
Apr 21, 2015

Conversation

larsbrinkhoff
Copy link
Contributor

Linguist currently recognizes .asc files with -----BEGIN as public key files (this is the "PEM" format). SSH2 uses ---- BEGIN, and OpenSSH files start with ssh-rsa or ssh-dss.

@larsbrinkhoff larsbrinkhoff changed the title Add support for RFC4761 and OpenSSH public keys Add support for SSH2/RFC4711 and OpenSSH/RFC4253 public keys Apr 19, 2015
@larsbrinkhoff larsbrinkhoff changed the title Add support for SSH2/RFC4711 and OpenSSH/RFC4253 public keys Add support for SSH2 and OpenSSH public keys Apr 19, 2015
Language["AsciiDoc"]
elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data)
Language["AGS Script"]
elsif /^-----BEGIN/.match(data)
elsif /^(-----BEGIN|ssh-(rsa|dss)) /.match(data)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should combine these into a single expression on L158?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

sshkey1.asc by Joseph Galbraith; Sleepycat license (GPL compatible).
arfon added a commit that referenced this pull request Apr 21, 2015
Add support for SSH2 and OpenSSH public keys
@arfon arfon merged commit accf734 into github-linguist:master Apr 21, 2015
@arfon
Copy link
Contributor

arfon commented Apr 21, 2015

👍 thanks @larsbrinkhoff

@arfon arfon mentioned this pull request May 15, 2015
@github-linguist github-linguist locked as resolved and limited conversation to collaborators Jun 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants