- markus@cvs.openbsd.org 2013/11/06 16:52:11

     [monitor_wrap.c]
     fix rekeying for AES-GCM modes; ok deraadt

diff --git a/ChangeLog b/ChangeLog
index d9d0690ff9cc2c2d7ccb74d83839cdec22346094..020dfd7f769047029ca188df7e8bd46dbfa29eff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
      [monitor.c]
      fix rekeying for KEX_C25519_SHA256; noted by dtucker@
      RCSID sync only; I thought this was a merge botch and fixed it already
+   - markus@cvs.openbsd.org 2013/11/06 16:52:11
+     [monitor_wrap.c]
+     fix rekeying for AES-GCM modes; ok deraadt
 
 20131104
  - (djm) OpenBSD CVS Sync

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 88ff68330ae9097a2255644eff1e324f0b70d510..4ce46960568a2b9fdf0c5c9e78dbe8eac105f1c9 100644 (file)
--- 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 <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -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;