summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--monitor_wrap.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a0d2545e..cb413838e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120131108
2 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2013/11/06 16:52:11
4 [monitor_wrap.c]
5 fix rekeying for AES-GCM modes; ok deraadt
6
120130913 720130913
2 - (djm) [channels.c] Fix unaligned access on sparc machines in SOCKS5 code; 8 - (djm) [channels.c] Fix unaligned access on sparc machines in SOCKS5 code;
3 ok dtucker@ 9 ok dtucker@
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 88ff68330..4ce469605 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.76 2013/05/17 00:13:13 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.77 2013/11/06 16:52:11 markus Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -482,7 +482,7 @@ mm_newkeys_from_blob(u_char *blob, int blen)
482 buffer_init(&b); 482 buffer_init(&b);
483 buffer_append(&b, blob, blen); 483 buffer_append(&b, blob, blen);
484 484
485 newkey = xmalloc(sizeof(*newkey)); 485 newkey = xcalloc(1, sizeof(*newkey));
486 enc = &newkey->enc; 486 enc = &newkey->enc;
487 mac = &newkey->mac; 487 mac = &newkey->mac;
488 comp = &newkey->comp; 488 comp = &newkey->comp;