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 commit 

remove superfluous protocol 2 mentions; ok jmc@

Upstream-ID: 0aaf7567c9f2e50fac5906b6a500a39c33c4664d
This commit is contained in:
naddy@openbsd.org 2017-05-05 10:41:58 +00:00 committed by Damien Miller
parent 744bde79c3
commit 2e9c324b3a
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssh-add.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-add.1,v 1.63 2017/05/03 06:32:02 jmc Exp $ .\" $OpenBSD: ssh-add.1,v 1.64 2017/05/05 10:41:58 naddy Exp $
.\" .\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -35,7 +35,7 @@
.\" (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.
.\" .\"
.Dd $Mdocdate: May 3 2017 $ .Dd $Mdocdate: May 5 2017 $
.Dt SSH-ADD 1 .Dt SSH-ADD 1
.Os .Os
.Sh NAME .Sh NAME
@ -174,13 +174,13 @@ socket used to communicate with the agent.
.Sh FILES .Sh FILES
.Bl -tag -width Ds .Bl -tag -width Ds
.It Pa ~/.ssh/id_dsa .It Pa ~/.ssh/id_dsa
Contains the protocol version 2 DSA authentication identity of the user. Contains the DSA authentication identity of the user.
.It Pa ~/.ssh/id_ecdsa .It Pa ~/.ssh/id_ecdsa
Contains the protocol version 2 ECDSA authentication identity of the user. Contains the ECDSA authentication identity of the user.
.It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519
Contains the protocol version 2 Ed25519 authentication identity of the user. Contains the Ed25519 authentication identity of the user.
.It Pa ~/.ssh/id_rsa .It Pa ~/.ssh/id_rsa
Contains the protocol version 2 RSA authentication identity of the user. Contains the RSA authentication identity of the user.
.El .El
.Pp .Pp
Identity files should not be readable by anyone but the user. Identity files should not be readable by anyone but the user.

10
ssh-keygen.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.140 2017/05/03 06:32:02 jmc Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.141 2017/05/05 10:41:58 naddy Exp $
.\" .\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -35,7 +35,7 @@
.\" (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.
.\" .\"
.Dd $Mdocdate: May 3 2017 $ .Dd $Mdocdate: May 5 2017 $
.Dt SSH-KEYGEN 1 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -148,7 +148,7 @@ The type of key to be generated is specified with the
option. option.
If invoked without any arguments, If invoked without any arguments,
.Nm .Nm
will generate an RSA key for use in SSH protocol 2 connections. will generate an RSA key.
.Pp .Pp
.Nm .Nm
is also used to generate groups for use in Diffie-Hellman group is also used to generate groups for use in Diffie-Hellman group
@ -816,7 +816,7 @@ A zero exit status will only be returned if no key was revoked.
.It Pa ~/.ssh/id_ecdsa .It Pa ~/.ssh/id_ecdsa
.It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519
.It Pa ~/.ssh/id_rsa .It Pa ~/.ssh/id_rsa
Contains the protocol version 2 DSA, ECDSA, Ed25519 or RSA Contains the DSA, ECDSA, Ed25519 or RSA
authentication identity of the user. authentication identity of the user.
This file should not be readable by anyone but the user. This file should not be readable by anyone but the user.
It is possible to It is possible to
@ -832,7 +832,7 @@ will read this file when a login attempt is made.
.It Pa ~/.ssh/id_ecdsa.pub .It Pa ~/.ssh/id_ecdsa.pub
.It Pa ~/.ssh/id_ed25519.pub .It Pa ~/.ssh/id_ed25519.pub
.It Pa ~/.ssh/id_rsa.pub .It Pa ~/.ssh/id_rsa.pub
Contains the protocol version 2 DSA, ECDSA, Ed25519 or RSA Contains the DSA, ECDSA, Ed25519 or RSA
public key for authentication. public key for authentication.
The contents of this file should be added to The contents of this file should be added to
.Pa ~/.ssh/authorized_keys .Pa ~/.ssh/authorized_keys

7
ssh.1
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.1,v 1.380 2017/05/03 21:49:18 naddy Exp $ .\" $OpenBSD: ssh.1,v 1.381 2017/05/05 10:41:58 naddy Exp $
.Dd $Mdocdate: May 3 2017 $ .Dd $Mdocdate: May 5 2017 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -271,8 +271,7 @@ The default is
.Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ed25519 .Pa ~/.ssh/id_ed25519
and and
.Pa ~/.ssh/id_rsa .Pa ~/.ssh/id_rsa .
for protocol version 2.
Identity files may also be specified on Identity files may also be specified on
a per-host basis in the configuration file. a per-host basis in the configuration file.
It is possible to have multiple It is possible to have multiple