diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-11-18 04:55:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-18 15:57:18 +1100 |
| commit | e2e1283404e06a22ac6135d057199e70dcadb8dd (patch) | |
| tree | 0bd92c67b22ba4c23578270ca59933d920235c3c /ssh_config.5 | |
| parent | 97dc5d1d82865a7d20f1eb193b5c62ce684024e5 (diff) | |
upstream: mention ed25519-sk key/cert types here too; prompted by
jmc@
OpenBSD-Commit-ID: e281977e4a4f121f3470517cbd5e483eee37b818
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 6983f7af..1f3c3413 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.306 2019/11/14 21:27:30 djm Exp $ -.Dd $Mdocdate: November 14 2019 $ +.\" $OpenBSD: ssh_config.5,v 1.307 2019/11/18 04:55:02 djm Exp $ +.Dd $Mdocdate: November 18 2019 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -931,6 +931,7 @@ The default is .Pa ~/.ssh/id_dsa , .Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa_sk , +.Pa ~/.ssh/id_ed25519_sk , .Pa ~/.ssh/id_ed25519 and .Pa ~/.ssh/id_rsa . @@ -1326,12 +1327,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, ecdsa-sha2-nistp256-cert-v01@openssh.com, ecdsa-sha2-nistp384-cert-v01@openssh.com, ecdsa-sha2-nistp521-cert-v01@openssh.com, +sk-ssh-ed25519-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, +sk-ssh-ed25519@openssh.com, ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa .Ed .Pp |