summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh-add.16
-rw-r--r--ssh-agent.16
-rw-r--r--ssh-keygen.112
-rw-r--r--ssh-keyscan.16
-rw-r--r--ssh.112
-rw-r--r--ssh_config.56
-rw-r--r--sshd.88
7 files changed, 28 insertions, 28 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index 4812448fa..9da7a2835 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.59 2013/12/07 11:58:46 naddy Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.60 2014/08/30 15:33:50 sobrado Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: December 7 2013 $ 38.Dd $Mdocdate: August 30 2014 $
39.Dt SSH-ADD 1 39.Dt SSH-ADD 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -171,7 +171,7 @@ Contains the protocol version 2 DSA authentication identity of the user.
171.It Pa ~/.ssh/id_ecdsa 171.It Pa ~/.ssh/id_ecdsa
172Contains the protocol version 2 ECDSA authentication identity of the user. 172Contains the protocol version 2 ECDSA authentication identity of the user.
173.It Pa ~/.ssh/id_ed25519 173.It Pa ~/.ssh/id_ed25519
174Contains the protocol version 2 ED25519 authentication identity of the user. 174Contains the protocol version 2 Ed25519 authentication identity of the user.
175.It Pa ~/.ssh/id_rsa 175.It Pa ~/.ssh/id_rsa
176Contains the protocol version 2 RSA authentication identity of the user. 176Contains the protocol version 2 RSA authentication identity of the user.
177.El 177.El
diff --git a/ssh-agent.1 b/ssh-agent.1
index a1e634fe0..b55065327 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.55 2014/04/16 23:28:12 djm Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.56 2014/08/30 15:33:50 sobrado Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.Dd $Mdocdate: April 16 2014 $ 37.Dd $Mdocdate: August 30 2014 $
38.Dt SSH-AGENT 1 38.Dt SSH-AGENT 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -53,7 +53,7 @@
53.Sh DESCRIPTION 53.Sh DESCRIPTION
54.Nm 54.Nm
55is a program to hold private keys used for public key authentication 55is a program to hold private keys used for public key authentication
56(RSA, DSA, ECDSA, ED25519). 56(RSA, DSA, ECDSA, Ed25519).
57.Nm 57.Nm
58is usually started in the beginning of an X-session or a login session, and 58is usually started in the beginning of an X-session or a login session, and
59all other windows or programs are started as clients to the ssh-agent 59all other windows or programs are started as clients to the ssh-agent
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 723a0162e..bf5f87bd3 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.122 2014/03/31 13:39:34 jmc Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.123 2014/08/30 15:33:50 sobrado Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: March 31 2014 $ 38.Dd $Mdocdate: August 30 2014 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -140,7 +140,7 @@ generates, manages and converts authentication keys for
140.Xr ssh 1 . 140.Xr ssh 1 .
141.Nm 141.Nm
142can create RSA keys for use by SSH protocol version 1 and 142can create RSA keys for use by SSH protocol version 1 and
143DSA, ECDSA, ED25519 or RSA keys for use by SSH protocol version 2. 143DSA, ECDSA, Ed25519 or RSA keys for use by SSH protocol version 2.
144The type of key to be generated is specified with the 144The type of key to be generated is specified with the
145.Fl t 145.Fl t
146option. 146option.
@@ -251,7 +251,7 @@ flag determines the key length by selecting from one of three elliptic
251curve sizes: 256, 384 or 521 bits. 251curve sizes: 256, 384 or 521 bits.
252Attempting to use bit lengths other than these three values for ECDSA keys 252Attempting to use bit lengths other than these three values for ECDSA keys
253will fail. 253will fail.
254ED25519 keys have a fixed length and the 254Ed25519 keys have a fixed length and the
255.Fl b 255.Fl b
256flag will be ignored. 256flag will be ignored.
257.It Fl C Ar comment 257.It Fl C Ar comment
@@ -803,7 +803,7 @@ There is no need to keep the contents of this file secret.
803.It Pa ~/.ssh/id_ecdsa 803.It Pa ~/.ssh/id_ecdsa
804.It Pa ~/.ssh/id_ed25519 804.It Pa ~/.ssh/id_ed25519
805.It Pa ~/.ssh/id_rsa 805.It Pa ~/.ssh/id_rsa
806Contains the protocol version 2 DSA, ECDSA, ED25519 or RSA 806Contains the protocol version 2 DSA, ECDSA, Ed25519 or RSA
807authentication identity of the user. 807authentication identity of the user.
808This file should not be readable by anyone but the user. 808This file should not be readable by anyone but the user.
809It is possible to 809It is possible to
@@ -819,7 +819,7 @@ will read this file when a login attempt is made.
819.It Pa ~/.ssh/id_ecdsa.pub 819.It Pa ~/.ssh/id_ecdsa.pub
820.It Pa ~/.ssh/id_ed25519.pub 820.It Pa ~/.ssh/id_ed25519.pub
821.It Pa ~/.ssh/id_rsa.pub 821.It Pa ~/.ssh/id_rsa.pub
822Contains the protocol version 2 DSA, ECDSA, ED25519 or RSA 822Contains the protocol version 2 DSA, ECDSA, Ed25519 or RSA
823public key for authentication. 823public key for authentication.
824The contents of this file should be added to 824The contents of this file should be added to
825.Pa ~/.ssh/authorized_keys 825.Pa ~/.ssh/authorized_keys
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 5c32ea9c7..6bbc480cd 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.35 2014/03/12 13:06:59 naddy Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.36 2014/08/30 15:33:50 sobrado Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -6,7 +6,7 @@
6.\" permitted provided that due credit is given to the author and the 6.\" permitted provided that due credit is given to the author and the
7.\" OpenBSD project by leaving this copyright notice intact. 7.\" OpenBSD project by leaving this copyright notice intact.
8.\" 8.\"
9.Dd $Mdocdate: March 12 2014 $ 9.Dd $Mdocdate: August 30 2014 $
10.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
11.Os 11.Os
12.Sh NAME 12.Sh NAME
@@ -130,7 +130,7 @@ Output format for RSA1 keys:
130host-or-namelist bits exponent modulus 130host-or-namelist bits exponent modulus
131.Ed 131.Ed
132.Pp 132.Pp
133Output format for RSA, DSA, ECDSA, and ED25519 keys: 133Output format for RSA, DSA, ECDSA, and Ed25519 keys:
134.Bd -literal 134.Bd -literal
135host-or-namelist keytype base64-encoded-key 135host-or-namelist keytype base64-encoded-key
136.Ed 136.Ed
diff --git a/ssh.1 b/ssh.1
index fa5cfb2c2..1c889b6c4 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.348 2014/07/24 22:57:10 millert Exp $ 36.\" $OpenBSD: ssh.1,v 1.349 2014/08/30 15:33:50 sobrado Exp $
37.Dd $Mdocdate: July 24 2014 $ 37.Dd $Mdocdate: August 30 2014 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -748,7 +748,7 @@ key pair for authentication purposes.
748The server knows the public key, and only the user knows the private key. 748The server knows the public key, and only the user knows the private key.
749.Nm 749.Nm
750implements public key authentication protocol automatically, 750implements public key authentication protocol automatically,
751using one of the DSA, ECDSA, ED25519 or RSA algorithms. 751using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
752Protocol 1 is restricted to using only RSA keys, 752Protocol 1 is restricted to using only RSA keys,
753but protocol 2 may use any. 753but protocol 2 may use any.
754The HISTORY section of 754The HISTORY section of
@@ -776,7 +776,7 @@ This stores the private key in
776.Pa ~/.ssh/id_ecdsa 776.Pa ~/.ssh/id_ecdsa
777(protocol 2 ECDSA), 777(protocol 2 ECDSA),
778.Pa ~/.ssh/id_ed25519 778.Pa ~/.ssh/id_ed25519
779(protocol 2 ED25519), 779(protocol 2 Ed25519),
780or 780or
781.Pa ~/.ssh/id_rsa 781.Pa ~/.ssh/id_rsa
782(protocol 2 RSA) 782(protocol 2 RSA)
@@ -788,7 +788,7 @@ and stores the public key in
788.Pa ~/.ssh/id_ecdsa.pub 788.Pa ~/.ssh/id_ecdsa.pub
789(protocol 2 ECDSA), 789(protocol 2 ECDSA),
790.Pa ~/.ssh/id_ed25519.pub 790.Pa ~/.ssh/id_ed25519.pub
791(protocol 2 ED25519), 791(protocol 2 Ed25519),
792or 792or
793.Pa ~/.ssh/id_rsa.pub 793.Pa ~/.ssh/id_rsa.pub
794(protocol 2 RSA) 794(protocol 2 RSA)
@@ -1328,7 +1328,7 @@ secret, but the recommended permissions are read/write/execute for the user,
1328and not accessible by others. 1328and not accessible by others.
1329.Pp 1329.Pp
1330.It Pa ~/.ssh/authorized_keys 1330.It Pa ~/.ssh/authorized_keys
1331Lists the public keys (DSA, ECDSA, ED25519, RSA) 1331Lists the public keys (DSA, ECDSA, Ed25519, RSA)
1332that can be used for logging in as this user. 1332that can be used for logging in as this user.
1333The format of this file is described in the 1333The format of this file is described in the
1334.Xr sshd 8 1334.Xr sshd 8
diff --git a/ssh_config.5 b/ssh_config.5
index f9ede7a31..4396aa907 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.191 2014/07/15 15:54:14 millert Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.192 2014/08/30 15:33:50 sobrado Exp $
37.Dd $Mdocdate: July 15 2014 $ 37.Dd $Mdocdate: August 30 2014 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -795,7 +795,7 @@ offers many different identities.
795The default is 795The default is
796.Dq no . 796.Dq no .
797.It Cm IdentityFile 797.It Cm IdentityFile
798Specifies a file from which the user's DSA, ECDSA, ED25519 or RSA authentication 798Specifies a file from which the user's DSA, ECDSA, Ed25519 or RSA authentication
799identity is read. 799identity is read.
800The default is 800The default is
801.Pa ~/.ssh/identity 801.Pa ~/.ssh/identity
diff --git a/sshd.8 b/sshd.8
index 01459d637..2e427f77e 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.276 2014/07/03 22:40:43 djm Exp $ 36.\" $OpenBSD: sshd.8,v 1.277 2014/08/30 15:33:50 sobrado Exp $
37.Dd $Mdocdate: July 3 2014 $ 37.Dd $Mdocdate: August 30 2014 $
38.Dt SSHD 8 38.Dt SSHD 8
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -278,7 +278,7 @@ though this can be changed via the
278.Cm Protocol 278.Cm Protocol
279option in 279option in
280.Xr sshd_config 5 . 280.Xr sshd_config 5 .
281Protocol 2 supports DSA, ECDSA, ED25519 and RSA keys; 281Protocol 2 supports DSA, ECDSA, Ed25519 and RSA keys;
282protocol 1 only supports RSA keys. 282protocol 1 only supports RSA keys.
283For both protocols, 283For both protocols,
284each host has a host-specific key, 284each host has a host-specific key,
@@ -808,7 +808,7 @@ secret, but the recommended permissions are read/write/execute for the user,
808and not accessible by others. 808and not accessible by others.
809.Pp 809.Pp
810.It Pa ~/.ssh/authorized_keys 810.It Pa ~/.ssh/authorized_keys
811Lists the public keys (DSA, ECDSA, ED25519, RSA) 811Lists the public keys (DSA, ECDSA, Ed25519, RSA)
812that can be used for logging in as this user. 812that can be used for logging in as this user.
813The format of this file is described above. 813The format of this file is described above.
814The content of the file is not highly sensitive, but the recommended 814The content of the file is not highly sensitive, but the recommended