diff --git a/ChangeLog b/ChangeLog index 35249dd85..e91ea2fdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,10 @@ [clientloop.c readconf.c readconf.h ssh.c ssh_config.5] add ControlMaster=auto/autoask options to support opportunistic multiplexing; tested avsm@ and jakob@, ok markus@ + - dtucker@cvs.openbsd.org 2005/06/09 13:43:49 + [cipher.c] + Correctly initialize end of array sentinel; ok djm@ + (Id sync only, change already in portable) 20050609 - (dtucker) [cipher.c openbsd-compat/Makefile.in @@ -2710,4 +2714,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3819 2005/06/16 03:19:41 djm Exp $ +$Id: ChangeLog,v 1.3820 2005/06/16 03:21:17 djm Exp $ diff --git a/cipher.c b/cipher.c index df46c0175..8096a5174 100644 --- a/cipher.c +++ b/cipher.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.74 2005/05/23 23:32:46 djm Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.75 2005/06/09 13:43:49 dtucker Exp $"); #include "xmalloc.h" #include "log.h"