diff options
| author | Damien Miller <djm@mindrot.org> | 2013-11-08 12:26:34 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-11-08 12:26:34 +1100 |
| commit | 13cfd6d68237ef844dd8e02cf9ed21268154a999 (patch) | |
| tree | 0f5d1c5bf0134fd5471e67bfc7b8982dc32ccb40 | |
| parent | 4425e64da7dee0b3e81f1ae301f56fa3a83fe221 (diff) | |
- markus@cvs.openbsd.org 2013/11/06 16:52:11
[monitor_wrap.c]
fix rekeying for AES-GCM modes; ok deraadt
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | monitor_wrap.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -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 88ff6833..4ce46960 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 <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; |