summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-11-09 14:02:03 +0000
committerColin Watson <cjwatson@debian.org>2013-11-09 14:02:03 +0000
commit35d1284f225e6b098a09b92afc01d17c73812e6b (patch)
tree4b41055057078716fe73a415d0c269a48d66ccf6 /monitor_wrap.c
parent327155e6824b3ee13837bdde04e4eb47e147ff46 (diff)
parent210ca37aa0cdf5499f0ea847ec150fefbfbf7c39 (diff)
* New upstream release (http://www.openssh.com/txt/release-6.4).
- sshd(8): fix a memory corruption problem triggered during rekeying when an AES-GCM cipher is selected (closes: #729029). Full details of the vulnerability are available at: http://www.openssh.com/txt/gcmrekey.adv
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 9662a4c63..670b62dfb 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>
@@ -500,7 +500,7 @@ mm_newkeys_from_blob(u_char *blob, int blen)
500 buffer_init(&b); 500 buffer_init(&b);
501 buffer_append(&b, blob, blen); 501 buffer_append(&b, blob, blen);
502 502
503 newkey = xmalloc(sizeof(*newkey)); 503 newkey = xcalloc(1, sizeof(*newkey));
504 enc = &newkey->enc; 504 enc = &newkey->enc;
505 mac = &newkey->mac; 505 mac = &newkey->mac;
506 comp = &newkey->comp; 506 comp = &newkey->comp;