diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:33:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:33:15 +1100 |
commit | 9c3f9505d9401a7af93098a59f3979e4608cde50 (patch) | |
tree | 81d49e2cd0f6f0da1a419c9c16260cacd4b89748 | |
parent | 5488b7ec4edc06e344f899933cab615d7b925b70 (diff) |
- stevesk@cvs.openbsd.org 2002/01/18 17:14:16
[sshd.8]
correct Ciphers default; paola.mannaro@ubs.com
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.8 | 8 |
2 files changed, 10 insertions, 3 deletions
@@ -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 | ||
205 | 20020121 | 208 | 20020121 |
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 $ |
@@ -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 | |||
397 | Specifies the ciphers allowed for protocol version 2. | 397 | Specifies the ciphers allowed for protocol version 2. |
398 | Multiple ciphers must be comma-separated. | 398 | Multiple ciphers must be comma-separated. |
399 | The default is | 399 | The 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 |
402 | Sets a timeout interval in seconds after which if no data has been received | 406 | Sets a timeout interval in seconds after which if no data has been received |
403 | from the client, | 407 | from the client, |