diff options
| author | Damien Miller <djm@mindrot.org> | 2013-11-07 13:35:39 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-11-07 13:35:39 +1100 |
| commit | 49c145c5e89b9d7d48e84328d6347d5ad640b567 (patch) | |
| tree | e5f2bc3a9aa045d95627c31b14fc418d9727c703 /monitor_wrap.c | |
| parent | 67a8800f290b39fd60e379988c700656ae3f2539 (diff) | |
| download | openssh-git-49c145c5e89b9d7d48e84328d6347d5ad640b567.tar.gz | |
- 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |