summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ssh_config.57
-rw-r--r--sshd.87
-rw-r--r--sshd_config.56
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
935and 936and
936.Pa ~/.ssh/id_rsa . 937.Pa ~/.ssh/id_rsa .
@@ -1326,12 +1327,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
1326ecdsa-sha2-nistp256-cert-v01@openssh.com, 1327ecdsa-sha2-nistp256-cert-v01@openssh.com,
1327ecdsa-sha2-nistp384-cert-v01@openssh.com, 1328ecdsa-sha2-nistp384-cert-v01@openssh.com,
1328ecdsa-sha2-nistp521-cert-v01@openssh.com, 1329ecdsa-sha2-nistp521-cert-v01@openssh.com,
1330sk-ssh-ed25519-cert-v01@openssh.com,
1329ssh-ed25519-cert-v01@openssh.com, 1331ssh-ed25519-cert-v01@openssh.com,
1330rsa-sha2-512-cert-v01@openssh.com, 1332rsa-sha2-512-cert-v01@openssh.com,
1331rsa-sha2-256-cert-v01@openssh.com, 1333rsa-sha2-256-cert-v01@openssh.com,
1332ssh-rsa-cert-v01@openssh.com, 1334ssh-rsa-cert-v01@openssh.com,
1333sk-ecdsa-sha2-nistp256@openssh.com, 1335sk-ecdsa-sha2-nistp256@openssh.com,
1334ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, 1336ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
1337sk-ssh-ed25519@openssh.com,
1335ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa 1338ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
1336.Ed 1339.Ed
1337.Pp 1340.Pp
diff --git a/sshd.8 b/sshd.8
index 14d5a2dac..042610a03 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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
442ecdsa-sha2-nistp521 442ecdsa-sha2-nistp521
443.It 443.It
444sk-ssh-ed25519@openssh.com
445.It
444ssh-ed25519 446ssh-ed25519
445.It 447.It
446ssh-dss 448ssh-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 ,
462or the 465or the
463.Pa id_rsa.pub 466.Pa id_rsa.pub
464file and edit it. 467file 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,
1431ecdsa-sha2-nistp256-cert-v01@openssh.com, 1431ecdsa-sha2-nistp256-cert-v01@openssh.com,
1432ecdsa-sha2-nistp384-cert-v01@openssh.com, 1432ecdsa-sha2-nistp384-cert-v01@openssh.com,
1433ecdsa-sha2-nistp521-cert-v01@openssh.com, 1433ecdsa-sha2-nistp521-cert-v01@openssh.com,
1434sk-ssh-ed25519-cert-v01@openssh.com,
1434ssh-ed25519-cert-v01@openssh.com, 1435ssh-ed25519-cert-v01@openssh.com,
1435rsa-sha2-512-cert-v01@openssh.com, 1436rsa-sha2-512-cert-v01@openssh.com,
1436rsa-sha2-256-cert-v01@openssh.com, 1437rsa-sha2-256-cert-v01@openssh.com,
1437ssh-rsa-cert-v01@openssh.com, 1438ssh-rsa-cert-v01@openssh.com,
1438sk-ecdsa-sha2-nistp256@openssh.com, 1439sk-ecdsa-sha2-nistp256@openssh.com,
1439ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, 1440ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
1441sk-ssh-ed25519@openssh.com,
1440ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa 1442ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
1441.Ed 1443.Ed
1442.Pp 1444.Pp
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-24 08:26:51 +0000