diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh.1 | 41 |
2 files changed, 21 insertions, 28 deletions
@@ -21,12 +21,12 @@ | |||
21 | - danh@cvs.openbsd.org 2001/02/10 15:14:11 | 21 | - danh@cvs.openbsd.org 2001/02/10 15:14:11 |
22 | [scp.c] | 22 | [scp.c] |
23 | fix memory leak; ok markus@ | 23 | fix memory leak; ok markus@ |
24 | - (bal) Minor correction to sftp-client.c I made. Should return 'status' | ||
25 | instead of '0' (from the OpenBSD tree) | ||
26 | - OpenBSD Sync | ||
27 | - djm@cvs.openbsd.org 2001/02/10 0:45:52 | 24 | - djm@cvs.openbsd.org 2001/02/10 0:45:52 |
28 | [scp.1] | 25 | [scp.1] |
29 | Mention that you can quote pathnames with spaces in them | 26 | Mention that you can quote pathnames with spaces in them |
27 | - (bal) Minor correction to sftp-client.c I made. Should return 'status' | ||
28 | instead of '0' (from the OpenBSD tree) | ||
29 | - (bal) Synced ssh.1 w/ OpenBSD | ||
30 | 30 | ||
31 | 20010210 | 31 | 20010210 |
32 | - (djm) Sync sftp and scp stuff from OpenBSD: | 32 | - (djm) Sync sftp and scp stuff from OpenBSD: |
@@ -3810,4 +3810,4 @@ | |||
3810 | - Wrote replacements for strlcpy and mkdtemp | 3810 | - Wrote replacements for strlcpy and mkdtemp |
3811 | - Released 1.0pre1 | 3811 | - Released 1.0pre1 |
3812 | 3812 | ||
3813 | $Id: ChangeLog,v 1.720 2001/02/10 21:59:35 mouring Exp $ | 3813 | $Id: ChangeLog,v 1.721 2001/02/10 22:08:03 mouring Exp $ |
@@ -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 | .\" $OpenBSD: ssh.1,v 1.84 2001/02/04 15:10:44 markus Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.90 2001/02/10 16:03:29 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -48,7 +48,7 @@ | |||
48 | .Op Ar command | 48 | .Op Ar command |
49 | .Pp | 49 | .Pp |
50 | .Nm ssh | 50 | .Nm ssh |
51 | .Op Fl afgknqstvxACNPTX246 | 51 | .Op Fl afgknqstvxACNPTX1246 |
52 | .Op Fl c Ar cipher_spec | 52 | .Op Fl c Ar cipher_spec |
53 | .Op Fl e Ar escape_char | 53 | .Op Fl e Ar escape_char |
54 | .Op Fl i Ar identity_file | 54 | .Op Fl i Ar identity_file |
@@ -374,11 +374,12 @@ cipher which is no longer fully supported in | |||
374 | .Ar blowfish | 374 | .Ar blowfish |
375 | is a fast block cipher, it appears very secure and is much faster than | 375 | is a fast block cipher, it appears very secure and is much faster than |
376 | .Ar 3des . | 376 | .Ar 3des . |
377 | .It Fl c Ar "3des-cbc,blowfish-cbc,arcfour,cast128-cbc" | 377 | .It Fl c Ar cipher_spec |
378 | Additionally, for protocol version 2 a comma-separated list of ciphers can | 378 | Additionally, for protocol version 2 a comma-separated list of ciphers can |
379 | be specified in order of preference. | 379 | be specified in order of preference. |
380 | Protocol version 2 supports 3DES, Blowfish, and CAST128 in CBC mode | 380 | See |
381 | and Arcfour. | 381 | .Cm Ciphers |
382 | for more information. | ||
382 | .It Fl e Ar ch|^ch|none | 383 | .It Fl e Ar ch|^ch|none |
383 | Sets the escape character for sessions with a pty (default: | 384 | Sets the escape character for sessions with a pty (default: |
384 | .Ql ~ ) . | 385 | .Ql ~ ) . |
@@ -549,6 +550,10 @@ from the local machine. | |||
549 | Port forwardings can also be specified in the configuration file. | 550 | Port forwardings can also be specified in the configuration file. |
550 | Privileged ports can be forwarded only when | 551 | Privileged ports can be forwarded only when |
551 | logging in as root on the remote machine. | 552 | logging in as root on the remote machine. |
553 | .It Fl 1 | ||
554 | Forces | ||
555 | .Nm | ||
556 | to try protocol version 1 only. | ||
552 | .It Fl 2 | 557 | .It Fl 2 |
553 | Forces | 558 | Forces |
554 | .Nm | 559 | .Nm |
@@ -562,22 +567,6 @@ Forces | |||
562 | .Nm | 567 | .Nm |
563 | to use IPv6 addresses only. | 568 | to use IPv6 addresses only. |
564 | .El | 569 | .El |
565 | .Pp | ||
566 | If | ||
567 | .Nm | ||
568 | is not invoked with one of the standard program names | ||
569 | .Pf ( Dq ssh , | ||
570 | .Dq slogin , | ||
571 | .Dq rsh , | ||
572 | .Dq rlogin , | ||
573 | or | ||
574 | .Dq remsh ) , | ||
575 | it uses this name as its | ||
576 | .Ar hostname | ||
577 | argument. | ||
578 | This is consistent with traditional | ||
579 | .Xr rsh 1 | ||
580 | behavior. | ||
581 | .Sh CONFIGURATION FILES | 570 | .Sh CONFIGURATION FILES |
582 | .Nm | 571 | .Nm |
583 | obtains configuration data from the following sources (in this order): | 572 | obtains configuration data from the following sources (in this order): |
@@ -668,7 +657,12 @@ Specifies the ciphers allowed for protocol version 2 | |||
668 | in order of preference. | 657 | in order of preference. |
669 | Multiple ciphers must be comma-separated. | 658 | Multiple ciphers must be comma-separated. |
670 | The default is | 659 | The default is |
671 | .Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc . | 660 | .Pp |
661 | .Bd -literal | ||
662 | ``3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc, | ||
663 | aes192-cbc,aes256-cbc,rijndael128-cbc,rijndael192-cbc, | ||
664 | rijndael256-cbc,rijndael-cbc@lysator.liu.se'' | ||
665 | .Ed | ||
672 | .It Cm Compression | 666 | .It Cm Compression |
673 | Specifies whether to use compression. | 667 | Specifies whether to use compression. |
674 | The argument must be | 668 | The argument must be |
@@ -1276,5 +1270,4 @@ protocol versions 1.5 and 2.0. | |||
1276 | .Xr ssh-agent 1 , | 1270 | .Xr ssh-agent 1 , |
1277 | .Xr ssh-keygen 1 , | 1271 | .Xr ssh-keygen 1 , |
1278 | .Xr telnet 1 , | 1272 | .Xr telnet 1 , |
1279 | .Xr sshd 8 , | 1273 | .Xr sshd 8 |
1280 | .Xr ssl 8 | ||