From 13cfd6d68237ef844dd8e02cf9ed21268154a999 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 8 Nov 2013 12:26:34 +1100 Subject: - markus@cvs.openbsd.org 2013/11/06 16:52:11 [monitor_wrap.c] fix rekeying for AES-GCM modes; ok deraadt --- ChangeLog | 6 ++++++ monitor_wrap.c | 4 ++-- 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 @@ +20131108 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2013/11/06 16:52:11 + [monitor_wrap.c] + fix rekeying for AES-GCM modes; ok deraadt + 20130913 - (djm) [channels.c] Fix unaligned access on sparc machines in SOCKS5 code; 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 @@ -/* $OpenBSD: monitor_wrap.c,v 1.76 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.77 2013/11/06 16:52:11 markus Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -482,7 +482,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) buffer_init(&b); buffer_append(&b, blob, blen); - newkey = xmalloc(sizeof(*newkey)); + newkey = xcalloc(1, sizeof(*newkey)); enc = &newkey->enc; mac = &newkey->mac; comp = &newkey->comp; -- cgit v1.2.3