diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-31 08:09:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-06-01 14:54:46 +1000 |
commit | 1e0cdf8efb745d0d1116e1aa22bdc99ee731695e (patch) | |
tree | 49ffdf3ef98eecd4141610e535f35bab5eea4603 /sshd.c | |
parent | 92e9fe633130376a95dd533df6e5e6a578c1e6b8 (diff) |
upstream commit
clear session keys from memory; ok djm@
Upstream-ID: ecd178819868975affd5fd6637458b7c712b6a0f
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.489 2017/05/31 07:00:13 markus Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.490 2017/05/31 08:09:45 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -649,6 +649,7 @@ privsep_postauth(Authctxt *authctxt) | |||
649 | else if (pmonitor->m_pid != 0) { | 649 | else if (pmonitor->m_pid != 0) { |
650 | verbose("User child is on pid %ld", (long)pmonitor->m_pid); | 650 | verbose("User child is on pid %ld", (long)pmonitor->m_pid); |
651 | buffer_clear(&loginmsg); | 651 | buffer_clear(&loginmsg); |
652 | monitor_clear_keystate(pmonitor); | ||
652 | monitor_child_postauth(pmonitor); | 653 | monitor_child_postauth(pmonitor); |
653 | 654 | ||
654 | /* NEVERREACHED */ | 655 | /* NEVERREACHED */ |
@@ -2032,6 +2033,7 @@ main(int ac, char **av) | |||
2032 | */ | 2033 | */ |
2033 | if (use_privsep) { | 2034 | if (use_privsep) { |
2034 | mm_send_keystate(pmonitor); | 2035 | mm_send_keystate(pmonitor); |
2036 | packet_clear_keys(); | ||
2035 | exit(0); | 2037 | exit(0); |
2036 | } | 2038 | } |
2037 | 2039 | ||