summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-07 13:35:39 +1100
committerDamien Miller <djm@mindrot.org>2013-11-07 13:35:39 +1100
commit49c145c5e89b9d7d48e84328d6347d5ad640b567 (patch)
treee5f2bc3a9aa045d95627c31b14fc418d9727c703 /monitor_wrap.c
parent67a8800f290b39fd60e379988c700656ae3f2539 (diff)
- markus@cvs.openbsd.org 2013/11/06 16:52:11
[monitor_wrap.c] fix rekeying for AES-GCM modes; ok deraadt
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c4
1 files changed, 2 insertions, 2 deletions
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;