summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--cipher.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35249dd85..e91ea2fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 [clientloop.c readconf.c readconf.h ssh.c ssh_config.5] 15 [clientloop.c readconf.c readconf.h ssh.c ssh_config.5]
16 add ControlMaster=auto/autoask options to support opportunistic 16 add ControlMaster=auto/autoask options to support opportunistic
17 multiplexing; tested avsm@ and jakob@, ok markus@ 17 multiplexing; tested avsm@ and jakob@, ok markus@
18 - dtucker@cvs.openbsd.org 2005/06/09 13:43:49
19 [cipher.c]
20 Correctly initialize end of array sentinel; ok djm@
21 (Id sync only, change already in portable)
18 22
1920050609 2320050609
20 - (dtucker) [cipher.c openbsd-compat/Makefile.in 24 - (dtucker) [cipher.c openbsd-compat/Makefile.in
@@ -2710,4 +2714,4 @@
2710 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2714 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2711 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2715 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2712 2716
2713$Id: ChangeLog,v 1.3819 2005/06/16 03:19:41 djm Exp $ 2717$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 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: cipher.c,v 1.74 2005/05/23 23:32:46 djm Exp $"); 38RCSID("$OpenBSD: cipher.c,v 1.75 2005/06/09 13:43:49 dtucker Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "log.h" 41#include "log.h"