diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2013-11-06 16:52:12 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2013-11-06 16:52:12 +0000 |
| commit | b2e8999c2f755e2aaf35e62ab78255fc8fe788cd (patch) | |
| tree | 9719ca765f0384cbe3911ec6281ac5d13383c104 /usr.bin | |
| parent | 1c0365749377de536afb46854f4e6030fd1b3217 (diff) | |
fix rekeying for AES-GCM modes; ok deraadt
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/monitor_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/monitor_wrap.c b/usr.bin/ssh/monitor_wrap.c index e78ceeb912c..b5dd8dfede6 100644 --- a/usr.bin/ssh/monitor_wrap.c +++ b/usr.bin/ssh/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> @@ -469,7 +469,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; |