summaryrefslogtreecommitdiff
path: root/ssh.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
committerColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
commitf38224d546cdde55f45c13d3d8225d273a3f920e (patch)
treea91a26b88ac90dc72d0ea3767feabb341eaa50a8 /ssh.0
parent338146a3fc257e216fe5c10fe40e6896b40d7739 (diff)
parente90790abaf031e037f444a6658e136e48577ea49 (diff)
merge 5.9p1
Diffstat (limited to 'ssh.0')
-rw-r--r--ssh.013
1 files changed, 8 insertions, 5 deletions
diff --git a/ssh.0 b/ssh.0
index c1d3135ce..1c98f7780 100644
--- a/ssh.0
+++ b/ssh.0
@@ -202,8 +202,9 @@ DESCRIPTION
202 the -O option is specified, the ctl_cmd argument is interpreted 202 the -O option is specified, the ctl_cmd argument is interpreted
203 and passed to the master process. Valid commands are: ``check'' 203 and passed to the master process. Valid commands are: ``check''
204 (check that the master process is running), ``forward'' (request 204 (check that the master process is running), ``forward'' (request
205 forwardings without command execution) and ``exit'' (request the 205 forwardings without command execution), ``exit'' (request the
206 master to exit). 206 master to exit), and ``stop'' (request the master to stop
207 accepting further multiplexing requests).
207 208
208 -o option 209 -o option
209 Can be used to give options in the format used in the 210 Can be used to give options in the format used in the
@@ -263,6 +264,7 @@ DESCRIPTION
263 PubkeyAuthentication 264 PubkeyAuthentication
264 RekeyLimit 265 RekeyLimit
265 RemoteForward 266 RemoteForward
267 RequestTTY
266 RhostsRSAAuthentication 268 RhostsRSAAuthentication
267 RSAAuthentication 269 RSAAuthentication
268 SendEnv 270 SendEnv
@@ -389,8 +391,9 @@ AUTHENTICATION
389 support similar authentication methods, but protocol 2 is the default 391 support similar authentication methods, but protocol 2 is the default
390 since it provides additional mechanisms for confidentiality (the traffic 392 since it provides additional mechanisms for confidentiality (the traffic
391 is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) and 393 is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) and
392 integrity (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160). Protocol 1 394 integrity (hmac-md5, hmac-sha1, hmac-sha2-256, hmac-sha2-512, umac-64,
393 lacks a strong mechanism for ensuring the integrity of the connection. 395 hmac-ripemd160). Protocol 1 lacks a strong mechanism for ensuring the
396 integrity of the connection.
394 397
395 The methods available for authentication are: GSSAPI-based 398 The methods available for authentication are: GSSAPI-based
396 authentication, host-based authentication, public key authentication, 399 authentication, host-based authentication, public key authentication,
@@ -895,4 +898,4 @@ AUTHORS
895 created OpenSSH. Markus Friedl contributed the support for SSH protocol 898 created OpenSSH. Markus Friedl contributed the support for SSH protocol
896 versions 1.5 and 2.0. 899 versions 1.5 and 2.0.
897 900
898OpenBSD 4.9 November 18, 2010 OpenBSD 4.9 901OpenBSD 5.0 August 2, 2011 OpenBSD 5.0