diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-10-11 21:51:40 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-10-11 21:51:40 +1100 |
commit | 7a4a76579e5321f52b773fc84f7bbe0f07adc5f2 (patch) | |
tree | 0367fc94a0c804625cd5399449ec4f616ee0524f /ssh.1 | |
parent | bad5076bb5d5587cf8b889cd9ce495c39282786b (diff) |
- jmc@cvs.openbsd.org 2009/10/08 20:42:12
[sshd_config.5 ssh_config.5 sshd.8 ssh.1]
some tweaks now that protocol 1 is not offered by default; ok markus
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -34,8 +34,8 @@ | |||
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 | .\" $OpenBSD: ssh.1,v 1.283 2009/03/19 15:15:09 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.284 2009/10/08 20:42:12 jmc Exp $ |
38 | .Dd $Mdocdate: March 19 2009 $ | 38 | .Dd $Mdocdate: October 8 2009 $ |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -666,20 +666,18 @@ exits with the exit status of the remote command or with 255 | |||
666 | if an error occurred. | 666 | if an error occurred. |
667 | .Sh AUTHENTICATION | 667 | .Sh AUTHENTICATION |
668 | The OpenSSH SSH client supports SSH protocols 1 and 2. | 668 | The OpenSSH SSH client supports SSH protocols 1 and 2. |
669 | Protocol 2 is the default, with | 669 | The default is to use protocol 2 only, |
670 | .Nm | 670 | though this can be changed via the |
671 | falling back to protocol 1 if it detects protocol 2 is unsupported. | ||
672 | These settings may be altered using the | ||
673 | .Cm Protocol | 671 | .Cm Protocol |
674 | option in | 672 | option in |
675 | .Xr ssh_config 5 , | 673 | .Xr ssh_config 5 |
676 | or enforced using the | 674 | or the |
677 | .Fl 1 | 675 | .Fl 1 |
678 | and | 676 | and |
679 | .Fl 2 | 677 | .Fl 2 |
680 | options (see above). | 678 | options (see above). |
681 | Both protocols support similar authentication methods, | 679 | Both protocols support similar authentication methods, |
682 | but protocol 2 is preferred since | 680 | but protocol 2 is the default since |
683 | it provides additional mechanisms for confidentiality | 681 | it provides additional mechanisms for confidentiality |
684 | (the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) | 682 | (the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) |
685 | and integrity (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160). | 683 | and integrity (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160). |