mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-27 07:44:29 +02:00
upstream commit
improve capitalization for the Ed25519 public-key signature system. ok djm@
This commit is contained in:
parent
7df8818409
commit
f70b22bcdd
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: ssh-add.1,v 1.59 2013/12/07 11:58:46 naddy Exp $
|
.\" $OpenBSD: ssh-add.1,v 1.60 2014/08/30 15:33:50 sobrado 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: December 7 2013 $
|
.Dd $Mdocdate: August 30 2014 $
|
||||||
.Dt SSH-ADD 1
|
.Dt SSH-ADD 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -171,7 +171,7 @@ Contains the protocol version 2 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 protocol version 2 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 protocol version 2 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 protocol version 2 RSA authentication identity of the user.
|
||||||
.El
|
.El
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: ssh-agent.1,v 1.55 2014/04/16 23:28:12 djm Exp $
|
.\" $OpenBSD: ssh-agent.1,v 1.56 2014/08/30 15:33:50 sobrado 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
|
||||||
@ -34,7 +34,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: April 16 2014 $
|
.Dd $Mdocdate: August 30 2014 $
|
||||||
.Dt SSH-AGENT 1
|
.Dt SSH-AGENT 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -53,7 +53,7 @@
|
|||||||
.Sh DESCRIPTION
|
.Sh DESCRIPTION
|
||||||
.Nm
|
.Nm
|
||||||
is a program to hold private keys used for public key authentication
|
is a program to hold private keys used for public key authentication
|
||||||
(RSA, DSA, ECDSA, ED25519).
|
(RSA, DSA, ECDSA, Ed25519).
|
||||||
.Nm
|
.Nm
|
||||||
is usually started in the beginning of an X-session or a login session, and
|
is usually started in the beginning of an X-session or a login session, and
|
||||||
all other windows or programs are started as clients to the ssh-agent
|
all other windows or programs are started as clients to the ssh-agent
|
||||||
|
12
ssh-keygen.1
12
ssh-keygen.1
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: ssh-keygen.1,v 1.122 2014/03/31 13:39:34 jmc Exp $
|
.\" $OpenBSD: ssh-keygen.1,v 1.123 2014/08/30 15:33:50 sobrado 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: March 31 2014 $
|
.Dd $Mdocdate: August 30 2014 $
|
||||||
.Dt SSH-KEYGEN 1
|
.Dt SSH-KEYGEN 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -140,7 +140,7 @@ generates, manages and converts authentication keys for
|
|||||||
.Xr ssh 1 .
|
.Xr ssh 1 .
|
||||||
.Nm
|
.Nm
|
||||||
can create RSA keys for use by SSH protocol version 1 and
|
can create RSA keys for use by SSH protocol version 1 and
|
||||||
DSA, ECDSA, ED25519 or RSA keys for use by SSH protocol version 2.
|
DSA, ECDSA, Ed25519 or RSA keys for use by SSH protocol version 2.
|
||||||
The type of key to be generated is specified with the
|
The type of key to be generated is specified with the
|
||||||
.Fl t
|
.Fl t
|
||||||
option.
|
option.
|
||||||
@ -251,7 +251,7 @@ flag determines the key length by selecting from one of three elliptic
|
|||||||
curve sizes: 256, 384 or 521 bits.
|
curve sizes: 256, 384 or 521 bits.
|
||||||
Attempting to use bit lengths other than these three values for ECDSA keys
|
Attempting to use bit lengths other than these three values for ECDSA keys
|
||||||
will fail.
|
will fail.
|
||||||
ED25519 keys have a fixed length and the
|
Ed25519 keys have a fixed length and the
|
||||||
.Fl b
|
.Fl b
|
||||||
flag will be ignored.
|
flag will be ignored.
|
||||||
.It Fl C Ar comment
|
.It Fl C Ar comment
|
||||||
@ -803,7 +803,7 @@ There is no need to keep the contents of this file secret.
|
|||||||
.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 protocol version 2 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
|
||||||
@ -819,7 +819,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 protocol version 2 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
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: ssh-keyscan.1,v 1.35 2014/03/12 13:06:59 naddy Exp $
|
.\" $OpenBSD: ssh-keyscan.1,v 1.36 2014/08/30 15:33:50 sobrado Exp $
|
||||||
.\"
|
.\"
|
||||||
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
|
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
|
||||||
.\"
|
.\"
|
||||||
@ -6,7 +6,7 @@
|
|||||||
.\" permitted provided that due credit is given to the author and the
|
.\" permitted provided that due credit is given to the author and the
|
||||||
.\" OpenBSD project by leaving this copyright notice intact.
|
.\" OpenBSD project by leaving this copyright notice intact.
|
||||||
.\"
|
.\"
|
||||||
.Dd $Mdocdate: March 12 2014 $
|
.Dd $Mdocdate: August 30 2014 $
|
||||||
.Dt SSH-KEYSCAN 1
|
.Dt SSH-KEYSCAN 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -130,7 +130,7 @@ Output format for RSA1 keys:
|
|||||||
host-or-namelist bits exponent modulus
|
host-or-namelist bits exponent modulus
|
||||||
.Ed
|
.Ed
|
||||||
.Pp
|
.Pp
|
||||||
Output format for RSA, DSA, ECDSA, and ED25519 keys:
|
Output format for RSA, DSA, ECDSA, and Ed25519 keys:
|
||||||
.Bd -literal
|
.Bd -literal
|
||||||
host-or-namelist keytype base64-encoded-key
|
host-or-namelist keytype base64-encoded-key
|
||||||
.Ed
|
.Ed
|
||||||
|
12
ssh.1
12
ssh.1
@ -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.348 2014/07/24 22:57:10 millert Exp $
|
.\" $OpenBSD: ssh.1,v 1.349 2014/08/30 15:33:50 sobrado Exp $
|
||||||
.Dd $Mdocdate: July 24 2014 $
|
.Dd $Mdocdate: August 30 2014 $
|
||||||
.Dt SSH 1
|
.Dt SSH 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -748,7 +748,7 @@ key pair for authentication purposes.
|
|||||||
The server knows the public key, and only the user knows the private key.
|
The server knows the public key, and only the user knows the private key.
|
||||||
.Nm
|
.Nm
|
||||||
implements public key authentication protocol automatically,
|
implements public key authentication protocol automatically,
|
||||||
using one of the DSA, ECDSA, ED25519 or RSA algorithms.
|
using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
|
||||||
Protocol 1 is restricted to using only RSA keys,
|
Protocol 1 is restricted to using only RSA keys,
|
||||||
but protocol 2 may use any.
|
but protocol 2 may use any.
|
||||||
The HISTORY section of
|
The HISTORY section of
|
||||||
@ -776,7 +776,7 @@ This stores the private key in
|
|||||||
.Pa ~/.ssh/id_ecdsa
|
.Pa ~/.ssh/id_ecdsa
|
||||||
(protocol 2 ECDSA),
|
(protocol 2 ECDSA),
|
||||||
.Pa ~/.ssh/id_ed25519
|
.Pa ~/.ssh/id_ed25519
|
||||||
(protocol 2 ED25519),
|
(protocol 2 Ed25519),
|
||||||
or
|
or
|
||||||
.Pa ~/.ssh/id_rsa
|
.Pa ~/.ssh/id_rsa
|
||||||
(protocol 2 RSA)
|
(protocol 2 RSA)
|
||||||
@ -788,7 +788,7 @@ and stores the public key in
|
|||||||
.Pa ~/.ssh/id_ecdsa.pub
|
.Pa ~/.ssh/id_ecdsa.pub
|
||||||
(protocol 2 ECDSA),
|
(protocol 2 ECDSA),
|
||||||
.Pa ~/.ssh/id_ed25519.pub
|
.Pa ~/.ssh/id_ed25519.pub
|
||||||
(protocol 2 ED25519),
|
(protocol 2 Ed25519),
|
||||||
or
|
or
|
||||||
.Pa ~/.ssh/id_rsa.pub
|
.Pa ~/.ssh/id_rsa.pub
|
||||||
(protocol 2 RSA)
|
(protocol 2 RSA)
|
||||||
@ -1328,7 +1328,7 @@ secret, but the recommended permissions are read/write/execute for the user,
|
|||||||
and not accessible by others.
|
and not accessible by others.
|
||||||
.Pp
|
.Pp
|
||||||
.It Pa ~/.ssh/authorized_keys
|
.It Pa ~/.ssh/authorized_keys
|
||||||
Lists the public keys (DSA, ECDSA, ED25519, RSA)
|
Lists the public keys (DSA, ECDSA, Ed25519, RSA)
|
||||||
that can be used for logging in as this user.
|
that can be used for logging in as this user.
|
||||||
The format of this file is described in the
|
The format of this file is described in the
|
||||||
.Xr sshd 8
|
.Xr sshd 8
|
||||||
|
@ -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.191 2014/07/15 15:54:14 millert Exp $
|
.\" $OpenBSD: ssh_config.5,v 1.192 2014/08/30 15:33:50 sobrado Exp $
|
||||||
.Dd $Mdocdate: July 15 2014 $
|
.Dd $Mdocdate: August 30 2014 $
|
||||||
.Dt SSH_CONFIG 5
|
.Dt SSH_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -795,7 +795,7 @@ offers many different identities.
|
|||||||
The default is
|
The default is
|
||||||
.Dq no .
|
.Dq no .
|
||||||
.It Cm IdentityFile
|
.It Cm IdentityFile
|
||||||
Specifies a file from which the user's DSA, ECDSA, ED25519 or RSA authentication
|
Specifies a file from which the user's DSA, ECDSA, Ed25519 or RSA authentication
|
||||||
identity is read.
|
identity is read.
|
||||||
The default is
|
The default is
|
||||||
.Pa ~/.ssh/identity
|
.Pa ~/.ssh/identity
|
||||||
|
8
sshd.8
8
sshd.8
@ -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.276 2014/07/03 22:40:43 djm Exp $
|
.\" $OpenBSD: sshd.8,v 1.277 2014/08/30 15:33:50 sobrado Exp $
|
||||||
.Dd $Mdocdate: July 3 2014 $
|
.Dd $Mdocdate: August 30 2014 $
|
||||||
.Dt SSHD 8
|
.Dt SSHD 8
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -278,7 +278,7 @@ though this can be changed via the
|
|||||||
.Cm Protocol
|
.Cm Protocol
|
||||||
option in
|
option in
|
||||||
.Xr sshd_config 5 .
|
.Xr sshd_config 5 .
|
||||||
Protocol 2 supports DSA, ECDSA, ED25519 and RSA keys;
|
Protocol 2 supports DSA, ECDSA, Ed25519 and RSA keys;
|
||||||
protocol 1 only supports RSA keys.
|
protocol 1 only supports RSA keys.
|
||||||
For both protocols,
|
For both protocols,
|
||||||
each host has a host-specific key,
|
each host has a host-specific key,
|
||||||
@ -808,7 +808,7 @@ secret, but the recommended permissions are read/write/execute for the user,
|
|||||||
and not accessible by others.
|
and not accessible by others.
|
||||||
.Pp
|
.Pp
|
||||||
.It Pa ~/.ssh/authorized_keys
|
.It Pa ~/.ssh/authorized_keys
|
||||||
Lists the public keys (DSA, ECDSA, ED25519, RSA)
|
Lists the public keys (DSA, ECDSA, Ed25519, RSA)
|
||||||
that can be used for logging in as this user.
|
that can be used for logging in as this user.
|
||||||
The format of this file is described above.
|
The format of this file is described above.
|
||||||
The content of the file is not highly sensitive, but the recommended
|
The content of the file is not highly sensitive, but the recommended
|
||||||
|
Loading…
x
Reference in New Issue
Block a user