summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-01-06 15:18:16 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-01-06 15:18:16 +0000
commitd26dcf3371657e64dddc7c86c61a89666d4e7053 (patch)
tree34c3c8ce1bacad2b8a5d5999c0461bcba4abfa5c /ssh.1
parent8835a8910513621a4c20a0ede9a4bdeee947cbd4 (diff)
20010107
- (bal) OpenBSD Sync - markus@cvs.openbsd.org 2001/01/06 11:23:27 [ssh-rsa.c] remove unused - itojun@cvs.openbsd.org 2001/01/05 08:23:29 [ssh-keyscan.1] missing .El - markus@cvs.openbsd.org 2001/01/04 22:41:03 [session.c sshconnect.c] consistent use of _PATH_BSHELL; from stevesk@pobox.com - djm@cvs.openbsd.org 2001/01/04 22:35:32 [ssh.1 sshd.8] Mention AES as available SSH2 Cipher; ok markus - markus@cvs.openbsd.org 2001/01/04 22:25:58 [sshd.c] sync usage()/man with defaults; from stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/04 22:21:26 [sshconnect2.c] handle SSH2_MSG_USERAUTH_BANNER; fixes bug when connecting to a server that prints a banner (e.g. /etc/issue.net)
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.14
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index 40cb6dfa8..f25c29987 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.74 2000/12/27 12:30:20 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.75 2001/01/04 22:35:32 djm Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -664,7 +664,7 @@ Specifies the ciphers allowed for protocol version 2
664in order of preference. 664in order of preference.
665Multiple ciphers must be comma-separated. 665Multiple ciphers must be comma-separated.
666The default is 666The default is
667.Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour . 667.Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc .
668.It Cm Compression 668.It Cm Compression
669Specifies whether to use compression. 669Specifies whether to use compression.
670The argument must be 670The argument must be