diff options
Diffstat (limited to 'usr/src/cmd/ssh/sshd')
| -rw-r--r-- | usr/src/cmd/ssh/sshd/altprivsep.c | 42 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/sshd/serverloop.c | 10 |
2 files changed, 46 insertions, 6 deletions
diff --git a/usr/src/cmd/ssh/sshd/altprivsep.c b/usr/src/cmd/ssh/sshd/altprivsep.c index c2c0a17e8b..4fa1a4850b 100644 --- a/usr/src/cmd/ssh/sshd/altprivsep.c +++ b/usr/src/cmd/ssh/sshd/altprivsep.c @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -167,6 +167,7 @@ static Authctxt *xxx_authctxt; extern void aps_monitor_loop(Authctxt *authctxt, int pipe, pid_t child_pid); static void aps_record_login(void); static void aps_record_logout(void); +static void aps_start_rekex(void); /* Altprivsep packet utilities for communication with the monitor */ static void altprivsep_packet_start(u_char); @@ -314,7 +315,7 @@ altprivsep_rekey(int type, u_int32_t seq, void *ctxt) } void -altprivsep_process_input(Kex *kex, fd_set *rset) +altprivsep_process_input(fd_set *rset) { void *data; int type; @@ -521,6 +522,15 @@ altprivsep_record_logout(pid_t pid) altprivsep_packet_read_expect(SSH2_PRIV_MSG_ALTPRIVSEP); } +void +altprivsep_start_rekex(void) +{ + altprivsep_packet_start(SSH2_PRIV_MSG_ALTPRIVSEP); + altprivsep_packet_put_char(APS_MSG_START_REKEX); + altprivsep_packet_send(); + altprivsep_packet_read_expect(SSH2_PRIV_MSG_ALTPRIVSEP); +} + static void aps_send_newkeys(void); /* Monitor side dispatch handler for SSH2_PRIV_MSG_ALTPRIVSEP */ @@ -542,6 +552,9 @@ aps_input_altpriv_msg(int type, u_int32_t seq, void *ctxt) case APS_MSG_RECORD_LOGOUT: aps_record_logout(); break; + case APS_MSG_START_REKEX: + aps_start_rekex(); + break; default: break; } @@ -667,6 +680,31 @@ aps_record_logout(void) packet_send(); } +static +void +aps_start_rekex(void) +{ + /* + * Send confirmation. We could implement it without that but it doesn't + * bring any harm to do that and we are consistent with other subtypes + * of our private SSH2_PRIV_MSG_ALTPRIVSEP message type. + */ + packet_start(SSH2_PRIV_MSG_ALTPRIVSEP); + packet_send(); + + /* + * KEX_INIT message could be the one that reached the limit. In that + * case, it was already forwarded to us from the unnprivileged child, + * and maybe even acted upon. Obviously we must not send another + * KEX_INIT message. + */ + if (!(xxx_kex->flags & KEX_INIT_SENT)) + kex_send_kexinit(xxx_kex); + else + debug2("rekeying already in progress"); +} + + /* Utilities for communication with the monitor */ static void diff --git a/usr/src/cmd/ssh/sshd/serverloop.c b/usr/src/cmd/ssh/sshd/serverloop.c index e7e7711f81..185c5cbcb8 100644 --- a/usr/src/cmd/ssh/sshd/serverloop.c +++ b/usr/src/cmd/ssh/sshd/serverloop.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -956,14 +956,16 @@ server_loop2(Authctxt *authctxt) if (!rekeying) { channel_after_select(readset, writeset); if (packet_need_rekeying()) { - debug("need rekeying"); + debug("rekey limit reached, need rekeying"); xxx_kex->done = 0; - kex_send_kexinit(xxx_kex); + debug("poking the monitor to start " + "key re-exchange"); + altprivsep_start_rekex(); } } #ifdef ALTPRIVSEP else - altprivsep_process_input(xxx_kex, readset); + altprivsep_process_input(readset); #endif /* ALTPRIVSEP */ process_input(readset); |