summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-11-19 09:35:20 +0000
committerdes <des@FreeBSD.org>2013-11-19 09:35:20 +0000
commit1dfe9ec22ad343727441d0d1e9a574a2f03804df (patch)
treead21fabafe183ca984f368b5c5cc580890f3d751 /crypto
parentd0736de43b0cd139e9d472088560404f89888bc6 (diff)
downloadFreeBSD-src-1dfe9ec22ad343727441d0d1e9a574a2f03804df.zip
FreeBSD-src-1dfe9ec22ad343727441d0d1e9a574a2f03804df.tar.gz
Pre-zero the MAC context.
Security: CVE-2013-4548 Security: FreeBSD-SA-13:14.openssh Approved by: re (implicit)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssh/monitor_wrap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/monitor_wrap.c b/crypto/openssh/monitor_wrap.c
index 88ff683..c004d37 100644
--- a/crypto/openssh/monitor_wrap.c
+++ b/crypto/openssh/monitor_wrap.c
@@ -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;
OpenPOWER on IntegriCloud