summaryrefslogtreecommitdiff
path: root/ssh.1
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.1
parent338146a3fc257e216fe5c10fe40e6896b40d7739 (diff)
parente90790abaf031e037f444a6658e136e48577ea49 (diff)
merge 5.9p1
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.115
1 files changed, 10 insertions, 5 deletions
diff --git a/ssh.1 b/ssh.1
index e3a42b5ad..9c1ca4b16 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.316 2010/11/18 15:01:00 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.320 2011/08/02 01:22:11 djm Exp $
37.Dd $Mdocdate: November 18 2010 $ 37.Dd $Mdocdate: August 2 2011 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -392,9 +392,11 @@ Valid commands are:
392.Dq check 392.Dq check
393(check that the master process is running), 393(check that the master process is running),
394.Dq forward 394.Dq forward
395(request forwardings without command execution) and 395(request forwardings without command execution),
396.Dq exit 396.Dq exit
397(request the master to exit). 397(request the master to exit), and
398.Dq stop
399(request the master to stop accepting further multiplexing requests).
398.It Fl o Ar option 400.It Fl o Ar option
399Can be used to give options in the format used in the configuration file. 401Can be used to give options in the format used in the configuration file.
400This is useful for specifying options for which there is no separate 402This is useful for specifying options for which there is no separate
@@ -454,6 +456,7 @@ For full details of the options listed below, and their possible values, see
454.It PubkeyAuthentication 456.It PubkeyAuthentication
455.It RekeyLimit 457.It RekeyLimit
456.It RemoteForward 458.It RemoteForward
459.It RequestTTY
457.It RhostsRSAAuthentication 460.It RhostsRSAAuthentication
458.It RSAAuthentication 461.It RSAAuthentication
459.It SendEnv 462.It SendEnv
@@ -664,7 +667,9 @@ Both protocols support similar authentication methods,
664but protocol 2 is the default since 667but protocol 2 is the default since
665it provides additional mechanisms for confidentiality 668it provides additional mechanisms for confidentiality
666(the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) 669(the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour)
667and integrity (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160). 670and integrity (hmac-md5, hmac-sha1,
671hmac-sha2-256, hmac-sha2-512,
672umac-64, hmac-ripemd160).
668Protocol 1 lacks a strong mechanism for ensuring the 673Protocol 1 lacks a strong mechanism for ensuring the
669integrity of the connection. 674integrity of the connection.
670.Pp 675.Pp