diff options
-rw-r--r-- | ssh_config.5 | 7 | ||||
-rw-r--r-- | sshd.8 | 7 | ||||
-rw-r--r-- | sshd_config.5 | 6 |
3 files changed, 14 insertions, 6 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 |
@@ -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: sshd.8,v 1.305 2019/11/07 08:38:38 naddy Exp $ | 36 | .\" $OpenBSD: sshd.8,v 1.306 2019/11/18 04:55:02 djm Exp $ |
37 | .Dd $Mdocdate: November 7 2019 $ | 37 | .Dd $Mdocdate: November 18 2019 $ |
38 | .Dt SSHD 8 | 38 | .Dt SSHD 8 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -441,6 +441,8 @@ ecdsa-sha2-nistp384 | |||
441 | .It | 441 | .It |
442 | ecdsa-sha2-nistp521 | 442 | ecdsa-sha2-nistp521 |
443 | .It | 443 | .It |
444 | sk-ssh-ed25519@openssh.com | ||
445 | .It | ||
444 | ssh-ed25519 | 446 | ssh-ed25519 |
445 | .It | 447 | .It |
446 | ssh-dss | 448 | ssh-dss |
@@ -459,6 +461,7 @@ You don't want to type them in; instead, copy the | |||
459 | .Pa id_ecdsa.pub , | 461 | .Pa id_ecdsa.pub , |
460 | .Pa id_ecdsa_sk.pub , | 462 | .Pa id_ecdsa_sk.pub , |
461 | .Pa id_ed25519.pub , | 463 | .Pa id_ed25519.pub , |
464 | .Pa id_ed25519_sk.pub , | ||
462 | or the | 465 | or the |
463 | .Pa id_rsa.pub | 466 | .Pa id_rsa.pub |
464 | file and edit it. | 467 | file and edit it. |
diff --git a/sshd_config.5 b/sshd_config.5 index f4caa162d..5052ca200 100644 --- a/sshd_config.5 +++ b/sshd_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: sshd_config.5,v 1.291 2019/11/07 08:38:38 naddy Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.292 2019/11/18 04:55:02 djm Exp $ |
37 | .Dd $Mdocdate: November 7 2019 $ | 37 | .Dd $Mdocdate: November 18 2019 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1431,12 +1431,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, | |||
1431 | ecdsa-sha2-nistp256-cert-v01@openssh.com, | 1431 | ecdsa-sha2-nistp256-cert-v01@openssh.com, |
1432 | ecdsa-sha2-nistp384-cert-v01@openssh.com, | 1432 | ecdsa-sha2-nistp384-cert-v01@openssh.com, |
1433 | ecdsa-sha2-nistp521-cert-v01@openssh.com, | 1433 | ecdsa-sha2-nistp521-cert-v01@openssh.com, |
1434 | sk-ssh-ed25519-cert-v01@openssh.com, | ||
1434 | ssh-ed25519-cert-v01@openssh.com, | 1435 | ssh-ed25519-cert-v01@openssh.com, |
1435 | rsa-sha2-512-cert-v01@openssh.com, | 1436 | rsa-sha2-512-cert-v01@openssh.com, |
1436 | rsa-sha2-256-cert-v01@openssh.com, | 1437 | rsa-sha2-256-cert-v01@openssh.com, |
1437 | ssh-rsa-cert-v01@openssh.com, | 1438 | ssh-rsa-cert-v01@openssh.com, |
1438 | sk-ecdsa-sha2-nistp256@openssh.com, | 1439 | sk-ecdsa-sha2-nistp256@openssh.com, |
1439 | ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, | 1440 | ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, |
1441 | sk-ssh-ed25519@openssh.com, | ||
1440 | ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa | 1442 | ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa |
1441 | .Ed | 1443 | .Ed |
1442 | .Pp | 1444 | .Pp |