tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: mention ed25519-sk key/cert types here too; prompted by 

jmc@

OpenBSD-Commit-ID: e281977e4a4f121f3470517cbd5e483eee37b818
This commit is contained in:
djm@openbsd.org 2019-11-18 04:55:02 +00:00 committed by Damien Miller
parent 97dc5d1d82
commit e2e1283404
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh_config.5,v 1.307 2019/11/18 04:55:02 djm Exp $
.Dd $Mdocdate: November 14 2019 $ .Dd $Mdocdate: November 18 2019 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -931,6 +931,7 @@ The default is
.Pa ~/.ssh/id_dsa , .Pa ~/.ssh/id_dsa ,
.Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ecdsa_sk , .Pa ~/.ssh/id_ecdsa_sk ,
.Pa ~/.ssh/id_ed25519_sk ,
.Pa ~/.ssh/id_ed25519 .Pa ~/.ssh/id_ed25519
and and
.Pa ~/.ssh/id_rsa . .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-nistp256-cert-v01@openssh.com,
ecdsa-sha2-nistp384-cert-v01@openssh.com, ecdsa-sha2-nistp384-cert-v01@openssh.com,
ecdsa-sha2-nistp521-cert-v01@openssh.com, ecdsa-sha2-nistp521-cert-v01@openssh.com,
sk-ssh-ed25519-cert-v01@openssh.com,
ssh-ed25519-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com,
rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com,
rsa-sha2-256-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
sk-ecdsa-sha2-nistp256@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
sk-ssh-ed25519@openssh.com,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
.Ed .Ed
.Pp .Pp

7
sshd.8
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd.8,v 1.305 2019/11/07 08:38:38 naddy Exp $ .\" $OpenBSD: sshd.8,v 1.306 2019/11/18 04:55:02 djm Exp $
.Dd $Mdocdate: November 7 2019 $ .Dd $Mdocdate: November 18 2019 $
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
.Sh NAME .Sh NAME
@ -441,6 +441,8 @@ ecdsa-sha2-nistp384
.It .It
ecdsa-sha2-nistp521 ecdsa-sha2-nistp521
.It .It
sk-ssh-ed25519@openssh.com
.It
ssh-ed25519 ssh-ed25519
.It .It
ssh-dss ssh-dss
@ -459,6 +461,7 @@ You don't want to type them in; instead, copy the
.Pa id_ecdsa.pub , .Pa id_ecdsa.pub ,
.Pa id_ecdsa_sk.pub , .Pa id_ecdsa_sk.pub ,
.Pa id_ed25519.pub , .Pa id_ed25519.pub ,
.Pa id_ed25519_sk.pub ,
or the or the
.Pa id_rsa.pub .Pa id_rsa.pub
file and edit it. file and edit it.

6
sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.291 2019/11/07 08:38:38 naddy Exp $ .\" $OpenBSD: sshd_config.5,v 1.292 2019/11/18 04:55:02 djm Exp $
.Dd $Mdocdate: November 7 2019 $ .Dd $Mdocdate: November 18 2019 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1431,12 +1431,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
ecdsa-sha2-nistp256-cert-v01@openssh.com, ecdsa-sha2-nistp256-cert-v01@openssh.com,
ecdsa-sha2-nistp384-cert-v01@openssh.com, ecdsa-sha2-nistp384-cert-v01@openssh.com,
ecdsa-sha2-nistp521-cert-v01@openssh.com, ecdsa-sha2-nistp521-cert-v01@openssh.com,
sk-ssh-ed25519-cert-v01@openssh.com,
ssh-ed25519-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com,
rsa-sha2-512-cert-v01@openssh.com, rsa-sha2-512-cert-v01@openssh.com,
rsa-sha2-256-cert-v01@openssh.com, rsa-sha2-256-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
sk-ecdsa-sha2-nistp256@openssh.com, sk-ecdsa-sha2-nistp256@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
sk-ssh-ed25519@openssh.com,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
.Ed .Ed
.Pp .Pp