diff -up openssh-5.8p1/audit-bsm.c.audit4 openssh-5.8p1/audit-bsm.c

--- openssh-5.8p1/audit-bsm.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/audit-bsm.c	2011-02-17 10:34:25.000000000 +0100

@@ -395,4 +395,10 @@ audit_kex_body(int ctos, char *enc, char

 {

 	/* not implemented */

 }

+

+void

+audit_session_key_free_body(int ctos)

+{

+	/* not implemented */

+}

 #endif /* BSM */

diff -up openssh-5.8p1/audit.c.audit4 openssh-5.8p1/audit.c

--- openssh-5.8p1/audit.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/audit.c	2011-02-17 10:34:25.000000000 +0100

@@ -152,6 +152,12 @@ audit_kex(int ctos, char *enc, char *mac

 	PRIVSEP(audit_kex_body(ctos, enc, mac, comp));

 }

+void

+audit_session_key_free(int ctos)

+{

+	PRIVSEP(audit_session_key_free_body(ctos));

+}

+

 # ifndef CUSTOM_SSH_AUDIT_EVENTS

 /*

  * Null implementations of audit functions.

@@ -254,5 +260,13 @@ audit_kex_body(int ctos, char *enc, char

 	debug("audit procol negotiation euid %d direction %d cipher %s mac %s compresion %s",

 		geteuid(), ctos, enc, mac, compress);

 }

+

+/*

+ * This will be called on succesfull session key discard

+ */

+audit_session_key_free_body(int ctos)

+{

+	debug("audit session key discard euid %d direction %d", geteuid(), ctos);

+}

 # endif  /* !defined CUSTOM_SSH_AUDIT_EVENTS */

 #endif /* SSH_AUDIT_EVENTS */

diff -up openssh-5.8p1/audit.h.audit4 openssh-5.8p1/audit.h

--- openssh-5.8p1/audit.h.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/audit.h	2011-02-17 10:34:25.000000000 +0100

@@ -60,5 +60,7 @@ void	audit_unsupported(int);

 void	audit_kex(int, char *, char *, char *);

 void	audit_unsupported_body(int);

 void	audit_kex_body(int, char *, char *, char *);

+void	audit_session_key_free(int ctos);

+void	audit_session_key_free_body(int ctos);

 #endif /* _SSH_AUDIT_H */

diff -up openssh-5.8p1/audit-linux.c.audit4 openssh-5.8p1/audit-linux.c

--- openssh-5.8p1/audit-linux.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/audit-linux.c	2011-02-17 10:34:25.000000000 +0100

@@ -246,13 +246,14 @@ audit_unsupported_body(int what)

 #endif

 }

+const static char *direction[] = { "from-server", "from-client", "both" };

+

 void

 audit_kex_body(int ctos, char *enc, char *mac, char *compress)

 {

 #ifdef AUDIT_CRYPTO_SESSION

 	char buf[AUDIT_LOG_SIZE];

 	int audit_fd, audit_ok;

-	const static char *direction[] = { "from-server", "from-client", "both" };

 	Cipher *cipher = cipher_by_name(enc);

 	snprintf(buf, sizeof(buf), "op=start direction=%s cipher=%s ksize=%d rport=%d laddr=%s lport=%d",

@@ -275,4 +276,29 @@ audit_kex_body(int ctos, char *enc, char

 #endif

 }

+void

+audit_session_key_free_body(int ctos)

+{

+	char buf[AUDIT_LOG_SIZE];

+	int audit_fd, audit_ok;

+

+	snprintf(buf, sizeof(buf), "op=destroy kind=session direction=%s rport=%d laddr=%s lport=%d",

+		 direction[ctos], get_remote_port(),

+		 get_local_ipaddr(packet_get_connection_in()),

+		 get_local_port());

+	audit_fd = audit_open();

+	if (audit_fd < 0) {

+		if (errno != EINVAL && errno != EPROTONOSUPPORT &&

+					 errno != EAFNOSUPPORT)

+			error("cannot open audit");

+		return;

+	}

+	audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_KEY_USER,

+			buf, NULL, get_remote_ipaddr(), NULL, 1);

+	audit_close(audit_fd);

+	/* do not abort if the error is EPERM and sshd is run as non root user */

+	if ((audit_ok < 0) && ((audit_ok != -1) || (getuid() == 0)))

+		error("cannot write into audit");

+}

+

 #endif /* USE_LINUX_AUDIT */

diff -up openssh-5.8p1/auditstub.c.audit4 openssh-5.8p1/auditstub.c

--- openssh-5.8p1/auditstub.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/auditstub.c	2011-02-17 10:34:25.000000000 +0100

@@ -37,3 +37,7 @@ audit_kex(int ctos, char *enc, char *mac

 {

 }

+void

+audit_session_key_free(int ctos)

+{

+}

diff -up openssh-5.8p1/kex.c.audit4 openssh-5.8p1/kex.c

--- openssh-5.8p1/kex.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/kex.c	2011-02-17 10:34:25.000000000 +0100

@@ -624,3 +624,34 @@ dump_digest(char *msg, u_char *digest, i

 	fprintf(stderr, "\n");

 }

 #endif

+

+static void

+enc_destroy(Enc *enc)

+{

+	if (enc == NULL)

+		return;

+

+	if (enc->key) {

+		memset(enc->key, 0, enc->key_len);

+		xfree(enc->key);

+	}

+

+	if (enc->iv) {

+		memset(enc->iv,  0, enc->block_size);

+		xfree(enc->iv);

+	}

+

+	memset(enc, 0, sizeof(*enc));

+}

+

+void

+newkeys_destroy(Newkeys *newkeys)

+{

+	if (newkeys == NULL)

+		return;

+

+	enc_destroy(&newkeys->enc);

+	mac_destroy(&newkeys->mac);

+	memset(&newkeys->comp, 0, sizeof(newkeys->comp));

+}

+

diff -up openssh-5.8p1/kex.h.audit4 openssh-5.8p1/kex.h

--- openssh-5.8p1/kex.h.audit4	2010-09-24 14:11:14.000000000 +0200

+++ openssh-5.8p1/kex.h	2011-02-17 10:34:25.000000000 +0100

@@ -156,6 +156,8 @@ void	 kexgex_server(Kex *);

 void	 kexecdh_client(Kex *);

 void	 kexecdh_server(Kex *);

+void	newkeys_destroy(Newkeys *newkeys);

+

 void

 kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,

     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);

diff -up openssh-5.8p1/mac.c.audit4 openssh-5.8p1/mac.c

--- openssh-5.8p1/mac.c.audit4	2008-06-13 02:58:50.000000000 +0200

+++ openssh-5.8p1/mac.c	2011-02-17 10:34:25.000000000 +0100

@@ -162,6 +162,20 @@ mac_clear(Mac *mac)

 	mac->umac_ctx = NULL;

 }

+void

+mac_destroy(Mac *mac)

+{

+	if (mac == NULL)

+		return;

+

+	if (mac->key) {

+		memset(mac->key, 0, mac->key_len);

+		xfree(mac->key);

+	}

+

+	memset(mac, 0, sizeof(*mac));

+}

+

 /* XXX copied from ciphers_valid */

 #define	MAC_SEP	","

 int

diff -up openssh-5.8p1/mac.h.audit4 openssh-5.8p1/mac.h

--- openssh-5.8p1/mac.h.audit4	2007-06-11 06:01:42.000000000 +0200

+++ openssh-5.8p1/mac.h	2011-02-17 10:34:25.000000000 +0100

@@ -28,3 +28,4 @@ int	 mac_setup(Mac *, char *);

 int	 mac_init(Mac *);

 u_char	*mac_compute(Mac *, u_int32_t, u_char *, int);

 void	 mac_clear(Mac *);

+void	 mac_destroy(Mac *);

diff -up openssh-5.8p1/monitor.c.audit4 openssh-5.8p1/monitor.c

--- openssh-5.8p1/monitor.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/monitor.c	2011-02-17 10:34:25.000000000 +0100

@@ -180,6 +180,7 @@ int mm_answer_audit_event(int, Buffer *)

 int mm_answer_audit_command(int, Buffer *);

 int mm_answer_audit_unsupported_body(int, Buffer *);

 int mm_answer_audit_kex_body(int, Buffer *);

+int mm_answer_audit_session_key_free_body(int, Buffer *);

 #endif

 static Authctxt *authctxt;

@@ -230,6 +231,7 @@ struct mon_table mon_dispatch_proto20[] 

     {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},

     {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body},

     {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body},

+    {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body},

 #endif

 #ifdef BSD_AUTH

     {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery},

@@ -268,6 +270,7 @@ struct mon_table mon_dispatch_postauth20

     {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command},

     {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body},

     {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body},

+    {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body},

 #endif

     {0, 0, NULL}

 };

@@ -301,6 +304,7 @@ struct mon_table mon_dispatch_proto15[] 

     {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},

     {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body},

     {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body},

+    {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body},

 #endif

     {0, 0, NULL}

 };

@@ -314,6 +318,7 @@ struct mon_table mon_dispatch_postauth15

     {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command},

     {MONITOR_REQ_AUDIT_UNSUPPORTED, MON_PERMIT, mm_answer_audit_unsupported_body},

     {MONITOR_REQ_AUDIT_KEX, MON_PERMIT, mm_answer_audit_kex_body},

+    {MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MON_PERMIT, mm_answer_audit_session_key_free_body},

 #endif

     {0, 0, NULL}

 };

@@ -2253,4 +2258,18 @@ mm_answer_audit_kex_body(int sock, Buffe

 	return 0;

 }

+int

+mm_answer_audit_session_key_free_body(int sock, Buffer *m)

+{

+	int ctos;

+

+	ctos = buffer_get_int(m);

+

+	audit_session_key_free_body(ctos);

+

+	buffer_clear(m);

+

+	mm_request_send(sock, MONITOR_ANS_AUDIT_SESSION_KEY_FREE, m);

+	return 0;

+}

 #endif /* SSH_AUDIT_EVENTS */

diff -up openssh-5.8p1/monitor.h.audit4 openssh-5.8p1/monitor.h

--- openssh-5.8p1/monitor.h.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/monitor.h	2011-02-17 10:34:25.000000000 +0100

@@ -68,6 +68,7 @@ enum monitor_reqtype {

 	MONITOR_REQ_JPAKE_CHECK_CONFIRM, MONITOR_ANS_JPAKE_CHECK_CONFIRM,

 	MONITOR_REQ_AUDIT_UNSUPPORTED, MONITOR_ANS_AUDIT_UNSUPPORTED,

 	MONITOR_REQ_AUDIT_KEX, MONITOR_ANS_AUDIT_KEX,

+	MONITOR_REQ_AUDIT_SESSION_KEY_FREE, MONITOR_ANS_AUDIT_SESSION_KEY_FREE,

 };

 struct mm_master;

diff -up openssh-5.8p1/monitor_wrap.c.audit4 openssh-5.8p1/monitor_wrap.c

--- openssh-5.8p1/monitor_wrap.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/monitor_wrap.c	2011-02-17 10:34:25.000000000 +0100

@@ -1446,4 +1446,17 @@ mm_audit_kex_body(int ctos, char *cipher

 	buffer_free(&m);

 }

+

+void

+mm_audit_session_key_free_body(int ctos)

+{

+	Buffer m;

+

+	buffer_init(&m);

+	buffer_put_int(&m, ctos);

+	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_SESSION_KEY_FREE, &m);

+	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUDIT_SESSION_KEY_FREE,

+				  &m);

+	buffer_free(&m);

+}

 #endif /* SSH_AUDIT_EVENTS */

diff -up openssh-5.8p1/monitor_wrap.h.audit4 openssh-5.8p1/monitor_wrap.h

--- openssh-5.8p1/monitor_wrap.h.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/monitor_wrap.h	2011-02-17 10:34:25.000000000 +0100

@@ -76,6 +76,7 @@ void mm_audit_event(ssh_audit_event_t);

 void mm_audit_run_command(const char *);

 void mm_audit_unsupported_body(int);

 void mm_audit_kex_body(int, char *, char *, char *);

+void mm_audit_session_key_free_body(int);

 #endif

 struct Session;

diff -up openssh-5.8p1/packet.c.audit4 openssh-5.8p1/packet.c

--- openssh-5.8p1/packet.c.audit4	2010-11-24 00:46:37.000000000 +0100

+++ openssh-5.8p1/packet.c	2011-02-17 10:34:25.000000000 +0100

@@ -497,6 +497,7 @@ packet_close(void)

 	}

 	cipher_cleanup(&active_state->send_context);

 	cipher_cleanup(&active_state->receive_context);

+	audit_session_key_free(2);

 }

 /* Sets remote side protocol flags. */

@@ -756,6 +757,7 @@ set_newkeys(int mode)

 	}

 	if (active_state->newkeys[mode] != NULL) {

 		debug("set_newkeys: rekeying");

+		audit_session_key_free(mode);

 		cipher_cleanup(cc);

 		enc  = &active_state->newkeys[mode]->enc;

 		mac  = &active_state->newkeys[mode]->mac;

@@ -1912,6 +1914,34 @@ packet_get_newkeys(int mode)

 	return (void *)active_state->newkeys[mode];

 }

+static void

+packet_destroy_state(struct session_state *state)

+{

+	if (state == NULL)

+		return;

+

+	cipher_cleanup(&state->receive_context);

+	cipher_cleanup(&state->send_context);

+

+	buffer_free(&state->input);

+	buffer_free(&state->output);

+	buffer_free(&state->outgoing_packet);

+	buffer_free(&state->incoming_packet);

+	buffer_free(&state->compression_buffer);

+	newkeys_destroy(state->newkeys[MODE_IN]);

+	newkeys_destroy(state->newkeys[MODE_OUT]);

+	mac_destroy(state->packet_discard_mac);

+//	TAILQ_HEAD(, packet) outgoing;

+//	memset(state, 0, sizeof(state));

+}

+

+void

+packet_destroy_all(void)

+{

+	packet_destroy_state(active_state);

+	packet_destroy_state(backup_state);

+}

+

 /*

  * Save the state for the real connection, and use a separate state when

  * resuming a suspended connection.

@@ -1919,18 +1949,12 @@ packet_get_newkeys(int mode)

 void

 packet_backup_state(void)

 {

-	struct session_state *tmp;

-

 	close(active_state->connection_in);

 	active_state->connection_in = -1;

 	close(active_state->connection_out);

 	active_state->connection_out = -1;

-	if (backup_state)

-		tmp = backup_state;

-	else

-		tmp = alloc_session_state();

 	backup_state = active_state;

-	active_state = tmp;

+	active_state = alloc_session_state();

 }

 /*

@@ -1947,9 +1971,7 @@ packet_restore_state(void)

 	backup_state = active_state;

 	active_state = tmp;

 	active_state->connection_in = backup_state->connection_in;

-	backup_state->connection_in = -1;

 	active_state->connection_out = backup_state->connection_out;

-	backup_state->connection_out = -1;

 	len = buffer_len(&backup_state->input);

 	if (len > 0) {

 		buf = buffer_ptr(&backup_state->input);

@@ -1957,4 +1979,10 @@ packet_restore_state(void)

 		buffer_clear(&backup_state->input);

 		add_recv_bytes(len);

 	}

+	backup_state->connection_in = -1;

+	backup_state->connection_out = -1;

+	packet_destroy_state(backup_state);

+	xfree(backup_state);

+	backup_state = NULL;

 }

+

diff -up openssh-5.8p1/packet.h.audit4 openssh-5.8p1/packet.h

--- openssh-5.8p1/packet.h.audit4	2010-11-20 05:19:38.000000000 +0100

+++ openssh-5.8p1/packet.h	2011-02-17 10:34:25.000000000 +0100

@@ -125,4 +125,5 @@ void	 packet_restore_state(void);

 void	*packet_get_input(void);

 void	*packet_get_output(void);

+void	 packet_destroy_all(void);

 #endif				/* PACKET_H */

diff -up openssh-5.8p1/sshd.c.audit4 openssh-5.8p1/sshd.c

--- openssh-5.8p1/sshd.c.audit4	2011-02-17 10:34:25.000000000 +0100

+++ openssh-5.8p1/sshd.c	2011-02-17 10:34:25.000000000 +0100

@@ -663,6 +663,8 @@ privsep_preauth(Authctxt *authctxt)

 	return (0);

 }

+extern Newkeys *current_keys[];

+

 static void

 privsep_postauth(Authctxt *authctxt)

 {

@@ -688,6 +690,10 @@ privsep_postauth(Authctxt *authctxt)

 		verbose("User child is on pid %ld", (long)pmonitor->m_pid);

 		close(pmonitor->m_recvfd);

 		buffer_clear(&loginmsg);

+ 		newkeys_destroy(current_keys[MODE_OUT]);

+		newkeys_destroy(current_keys[MODE_IN]);

+		packet_destroy_all();

+		audit_session_key_free_body(2);

 		monitor_child_postauth(pmonitor);

 		/* NEVERREACHED */

@@ -1974,6 +1980,8 @@ main(int ac, char **av)

 	 */

 	if (use_privsep) {

 		mm_send_keystate(pmonitor);

+		packet_destroy_all();

+		audit_session_key_free(2);

 		exit(0);

 	}

@@ -2026,6 +2034,9 @@ main(int ac, char **av)

 	do_authenticated(authctxt);

 	/* The connection has been terminated. */

+	packet_destroy_all();

+	audit_session_key_free(2);

+

 	packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes);

 	packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes);

 	verbose("Transferred: sent %llu, received %llu bytes",