commit 1e0cdf8efb745d0d1116e1aa22bdc99ee731695e
author markus@openbsd.org <markus@openbsd.org> Wed May 31 08:09:45 2017 +0000
committer Damien Miller <djm@mindrot.org> Thu Jun 01 14:54:46 2017 +1000
tree 49ffdf3ef98eecd4141610e535f35bab5eea4603
parent 92e9fe633130376a95dd533df6e5e6a578c1e6b8

upstream commit

clear session keys from memory; ok djm@

Upstream-ID: ecd178819868975affd5fd6637458b7c712b6a0f

monitor.c

diff --git a/monitor.c b/monitor.c
index 2dee972..ef107a2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.169 2017/05/30 14:10:53 markus Exp $ */
+/* $OpenBSD: monitor.c,v 1.170 2017/05/31 08:09:45 markus Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1584,6 +1584,17 @@
 #endif /* SSH_AUDIT_EVENTS */
 
 void
+monitor_clear_keystate(struct monitor *pmonitor)
+{
+	struct ssh *ssh = active_state;	/* XXX */
+
+	ssh_clear_newkeys(ssh, MODE_IN);
+	ssh_clear_newkeys(ssh, MODE_OUT);
+	sshbuf_free(child_state);
+	child_state = NULL;
+}
+
+void
 monitor_apply_keystate(struct monitor *pmonitor)
 {
 	struct ssh *ssh = active_state;	/* XXX */