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 6983f7af4..1f3c3413f 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.306 2019/11/14 21:27:30 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.307 2019/11/18 04:55:02 djm Exp $ |
37 | .Dd $Mdocdate: November 14 2019 $ | 37 | .Dd $Mdocdate: November 18 2019 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -931,6 +931,7 @@ The default is | |||
931 | .Pa ~/.ssh/id_dsa , | 931 | .Pa ~/.ssh/id_dsa , |
932 | .Pa ~/.ssh/id_ecdsa , | 932 | .Pa ~/.ssh/id_ecdsa , |
933 | .Pa ~/.ssh/id_ecdsa_sk , | 933 | .Pa ~/.ssh/id_ecdsa_sk , |
934 | .Pa ~/.ssh/id_ed25519_sk , | ||
934 | .Pa ~/.ssh/id_ed25519 | 935 | .Pa ~/.ssh/id_ed25519 |
935 | and | 936 | and |
936 | .Pa ~/.ssh/id_rsa . | 937 | .Pa ~/.ssh/id_rsa . |
@@ -1326,12 +1327,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, | |||
1326 | ecdsa-sha2-nistp256-cert-v01@openssh.com, | 1327 | ecdsa-sha2-nistp256-cert-v01@openssh.com, |
1327 | ecdsa-sha2-nistp384-cert-v01@openssh.com, | 1328 | ecdsa-sha2-nistp384-cert-v01@openssh.com, |
1328 | ecdsa-sha2-nistp521-cert-v01@openssh.com, | 1329 | ecdsa-sha2-nistp521-cert-v01@openssh.com, |
1330 | sk-ssh-ed25519-cert-v01@openssh.com, | ||
1329 | ssh-ed25519-cert-v01@openssh.com, | 1331 | ssh-ed25519-cert-v01@openssh.com, |
1330 | rsa-sha2-512-cert-v01@openssh.com, | 1332 | rsa-sha2-512-cert-v01@openssh.com, |
1331 | rsa-sha2-256-cert-v01@openssh.com, | 1333 | rsa-sha2-256-cert-v01@openssh.com, |
1332 | ssh-rsa-cert-v01@openssh.com, | 1334 | ssh-rsa-cert-v01@openssh.com, |
1333 | sk-ecdsa-sha2-nistp256@openssh.com, | 1335 | sk-ecdsa-sha2-nistp256@openssh.com, |
1334 | ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, | 1336 | ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, |
1337 | sk-ssh-ed25519@openssh.com, | ||
1335 | ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa | 1338 | ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa |
1336 | .Ed | 1339 | .Ed |
1337 | .Pp | 1340 | .Pp |