summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-09-14 15:43:03 +0100
committerColin Watson <cjwatson@debian.org>2013-09-14 15:43:03 +0100
commit8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (patch)
treee6cb74192adb00fda5e4d1457547851d7e0d86af /ssh.1
parent328b60656f29db6306994d7498dede386ec2d1c3 (diff)
parentc41345ad7ee5a22689e2c009595e85fa27b4b39a (diff)
merge 6.3p1
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.136
1 files changed, 27 insertions, 9 deletions
diff --git a/ssh.1 b/ssh.1
index a5576edb6..62292cc09 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.330 2012/10/04 13:21:50 markus Exp $ 36.\" $OpenBSD: ssh.1,v 1.334 2013/07/18 01:12:26 djm Exp $
37.Dd $Mdocdate: October 4 2012 $ 37.Dd $Mdocdate: July 18 2013 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -47,6 +47,7 @@
47.Op Fl b Ar bind_address 47.Op Fl b Ar bind_address
48.Op Fl c Ar cipher_spec 48.Op Fl c Ar cipher_spec
49.Op Fl D Oo Ar bind_address : Oc Ns Ar port 49.Op Fl D Oo Ar bind_address : Oc Ns Ar port
50.Op Fl E Ar log_file
50.Op Fl e Ar escape_char 51.Op Fl e Ar escape_char
51.Op Fl F Ar configfile 52.Op Fl F Ar configfile
52.Op Fl I Ar pkcs11 53.Op Fl I Ar pkcs11
@@ -64,6 +65,8 @@
64.Oo Ar user Ns @ Oc Ns Ar hostname 65.Oo Ar user Ns @ Oc Ns Ar hostname
65.Op Ar command 66.Op Ar command
66.Ek 67.Ek
68.Nm
69.Fl Q Ar protocol_feature
67.Sh DESCRIPTION 70.Sh DESCRIPTION
68.Nm 71.Nm
69(SSH client) is a program for logging into a remote machine and for 72(SSH client) is a program for logging into a remote machine and for
@@ -217,6 +220,10 @@ indicates that the listening port be bound for local use only, while an
217empty address or 220empty address or
218.Sq * 221.Sq *
219indicates that the port should be available from all interfaces. 222indicates that the port should be available from all interfaces.
223.It Fl E Ar log_file
224Append debug logs to
225.Ar log_file
226instead of standard error.
220.It Fl e Ar escape_char 227.It Fl e Ar escape_char
221Sets the escape character for sessions with a pty (default: 228Sets the escape character for sessions with a pty (default:
222.Ql ~ ) . 229.Ql ~ ) .
@@ -482,6 +489,21 @@ For full details of the options listed below, and their possible values, see
482Port to connect to on the remote host. 489Port to connect to on the remote host.
483This can be specified on a 490This can be specified on a
484per-host basis in the configuration file. 491per-host basis in the configuration file.
492.It Fl Q Ar protocol_feature
493Queries
494.Nm
495for the algorithms supported for the specified version 2
496.Ar protocol_feature .
497The queriable features are:
498.Dq cipher
499(supported symmetric ciphers),
500.Dq MAC
501(supported message integrity codes),
502.Dq KEX
503(key exchange algorithms),
504.Dq key
505(key types).
506Protocol features are treated case-insensitively.
485.It Fl q 507.It Fl q
486Quiet mode. 508Quiet mode.
487Causes most warning and diagnostic messages to be suppressed. 509Causes most warning and diagnostic messages to be suppressed.
@@ -732,9 +754,7 @@ implements public key authentication protocol automatically,
732using one of the DSA, ECDSA or RSA algorithms. 754using one of the DSA, ECDSA or RSA algorithms.
733Protocol 1 is restricted to using only RSA keys, 755Protocol 1 is restricted to using only RSA keys,
734but protocol 2 may use any. 756but protocol 2 may use any.
735The 757The HISTORY section of
736.Sx HISTORY
737section of
738.Xr ssl 8 758.Xr ssl 8
739contains a brief discussion of the DSA and RSA algorithms. 759contains a brief discussion of the DSA and RSA algorithms.
740.Pp 760.Pp
@@ -790,9 +810,7 @@ instead of a set of public/private keys,
790signed certificates are used. 810signed certificates are used.
791This has the advantage that a single trusted certification authority 811This has the advantage that a single trusted certification authority
792can be used in place of many public/private keys. 812can be used in place of many public/private keys.
793See the 813See the CERTIFICATES section of
794.Sx CERTIFICATES
795section of
796.Xr ssh-keygen 1 814.Xr ssh-keygen 1
797for more information. 815for more information.
798.Pp 816.Pp
@@ -1319,7 +1337,7 @@ This is the per-user configuration file.
1319The file format and configuration options are described in 1337The file format and configuration options are described in
1320.Xr ssh_config 5 . 1338.Xr ssh_config 5 .
1321Because of the potential for abuse, this file must have strict permissions: 1339Because of the potential for abuse, this file must have strict permissions:
1322read/write for the user, and not accessible by others. 1340read/write for the user, and not writable by others.
1323.Pp 1341.Pp
1324.It Pa ~/.ssh/environment 1342.It Pa ~/.ssh/environment
1325Contains additional definitions for environment variables; see 1343Contains additional definitions for environment variables; see