summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.88
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ee72e9d43..129c3fc2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -201,6 +201,9 @@
201 - stevesk@cvs.openbsd.org 2002/01/17 04:27:37 201 - stevesk@cvs.openbsd.org 2002/01/17 04:27:37
202 [log.c] 202 [log.c]
203 casts to silence enum type warnings for bugzilla bug 37; ok markus@ 203 casts to silence enum type warnings for bugzilla bug 37; ok markus@
204 - stevesk@cvs.openbsd.org 2002/01/18 17:14:16
205 [sshd.8]
206 correct Ciphers default; paola.mannaro@ubs.com
204 207
20520020121 20820020121
206 - (djm) Rework ssh-rand-helper: 209 - (djm) Rework ssh-rand-helper:
@@ -7348,4 +7351,4 @@
7348 - Wrote replacements for strlcpy and mkdtemp 7351 - Wrote replacements for strlcpy and mkdtemp
7349 - Released 1.0pre1 7352 - Released 1.0pre1
7350 7353
7351$Id: ChangeLog,v 1.1779 2002/01/22 12:32:57 djm Exp $ 7354$Id: ChangeLog,v 1.1780 2002/01/22 12:33:15 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 971724799..61d88c142 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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: sshd.8,v 1.161 2002/01/05 21:51:56 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.162 2002/01/18 17:14:16 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -397,7 +397,11 @@ The default is
397Specifies the ciphers allowed for protocol version 2. 397Specifies the ciphers allowed for protocol version 2.
398Multiple ciphers must be comma-separated. 398Multiple ciphers must be comma-separated.
399The default is 399The default is
400.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour . 400.Pp
401.Bd -literal
402 ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
403 aes192-cbc,aes256-cbc''
404.Ed
401.It Cm ClientAliveInterval 405.It Cm ClientAliveInterval
402Sets a timeout interval in seconds after which if no data has been received 406Sets a timeout interval in seconds after which if no data has been received
403from the client, 407from the client,