diff options
| author | Artemis Tosini <me@artem.ist> | 2021-01-20 20:36:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 20:36:55 +0000 |
| commit | cb08248c33a9e0f57c1480d0289b632da5d77668 (patch) | |
| tree | 228f1786549b7365bd9ea2bff6a1b4bf3491a194 /options | |
| parent | ef85bf84ee42678c1dcb3d6ea69565737c2f6eed (diff) | |
| download | gitea-cb08248c33a9e0f57c1480d0289b632da5d77668.tar.gz gitea-cb08248c33a9e0f57c1480d0289b632da5d77668.zip | |
Add support for ed25519_sk and ecdsa_sk SSH keys (#13462)
* Add support for ed25519_sk and ecdsa_sk SSH keys
These start with sk-ssh-ed25519@openssh.com and sk-ecdsa-sha2-nistp256@openssh.com.
They are supported in recent versions of go x/crypto/ssh and OpenSSH 8.2
or higher.
* skip ssh-keygen
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a64716beaf..142f3049f3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -519,7 +519,7 @@ ssh_helper = <strong>Need help?</strong> Have a look at GitHub's guide to <a hre gpg_helper = <strong>Need help?</strong> Have a look at GitHub's guide <a href="%s">about GPG</a>. add_new_key = Add SSH Key add_new_gpg_key = Add GPG Key -key_content_ssh_placeholder = Begins with 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521' +key_content_ssh_placeholder = Begins with 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com', or 'sk-ssh-ed25519@openssh.com' key_content_gpg_placeholder = Begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----' add_new_principal = Add Principal ssh_key_been_used = This SSH key has already been added to the server. |