From 91cf261bd5604132496359ad4c18f8a15db7076b Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 22 Jun 2003 20:46:53 +1000 Subject: [PATCH] 20030622 - (dtucker) OpenBSD CVS Sync - djm@cvs.openbsd.org 2003/06/20 05:47:58 [sshd_config.5] sync description of protocol 2 cipher proposal; ok markus --- ChangeLog | 5 ++++- sshd_config.5 | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba4f1f21d..a406f9c61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ [ssh-rsa.c] backout last change, since it violates pkcs#1 switch to share/misc/license.template + - djm@cvs.openbsd.org 2003/06/20 05:47:58 + [sshd_config.5] + sync description of protocol 2 cipher proposal; ok markus - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before testing its value. @@ -572,4 +575,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2819 2003/06/22 10:45:15 dtucker Exp $ +$Id: ChangeLog,v 1.2820 2003/06/22 10:46:53 dtucker Exp $ diff --git a/sshd_config.5 b/sshd_config.5 index 522911a39..dfd3565a6 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.19 2003/06/10 09:12:12 jmc Exp $ +.\" $OpenBSD: sshd_config.5,v 1.20 2003/06/20 05:47:58 djm Exp $ .Dd September 25, 1999 .Dt SSHD_CONFIG 5 .Os @@ -139,7 +139,7 @@ The default is .Pp .Bd -literal ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, - aes192-cbc,aes256-cbc'' + aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' .Ed .It Cm ClientAliveInterval Sets a timeout interval in seconds after which if no data has been received