# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1328872192 -28800
# Node ID 234cf769bcb3352e466ed84d7975a9233e98ef65
# Parent  452bcf810e44e21970c7764de097d15da8a2c21c# Parent  4222a1039b065920882d7d55fb39b3ebd3374c0d
Merge

diff -r 452bcf810e44 -r 234cf769bcb3 circbuffer.c
--- a/circbuffer.c	Thu Nov 10 18:17:00 2011 +0800
+++ b/circbuffer.c	Fri Feb 10 19:09:52 2012 +0800
@@ -48,6 +48,7 @@
 
 void cbuf_free(circbuffer * cbuf) {
 
+	m_burn(cbuf->data, cbuf->size);
 	m_free(cbuf->data);
 	m_free(cbuf);
 }
diff -r 452bcf810e44 -r 234cf769bcb3 common-kex.c
--- a/common-kex.c	Thu Nov 10 18:17:00 2011 +0800
+++ b/common-kex.c	Fri Feb 10 19:09:52 2012 +0800
@@ -366,6 +366,11 @@
 	ses.keys = ses.newkeys;
 	ses.newkeys = NULL;
 
+	m_burn(C2S_IV, sizeof(C2S_IV));
+	m_burn(C2S_key, sizeof(C2S_key));
+	m_burn(S2C_IV, sizeof(S2C_IV));
+	m_burn(S2C_key, sizeof(S2C_key));
+
 	TRACE(("leave gen_new_keys"))
 }