http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.5p1-hpn12v14.diff.gz

[gssapi-openssh.git] / openssh / packet.c

diff --git a/openssh/packet.c b/openssh/packet.c
index ab5a01002aac6832cb197624457e33b2709e042b..64970e8672da3f57df9a9bdc332efd0ad194b6bf 100644 (file)
--- a/openssh/packet.c
+++ b/openssh/packet.c
@@ -1576,6 +1576,13 @@ packet_send_ignore(int nbytes)
                rnd >>= 8;
        }
 }
+int rekey_requested = 0;
+
+void
+packet_request_rekeying(void)
+{
+       rekey_requested = 1;
+}
 
 #define MAX_PACKETS    (1U<<31)
 int
@@ -1583,6 +1590,11 @@ packet_need_rekeying(void)
 {
        if (datafellows & SSH_BUG_NOREKEY)
                return 0;
+       if (rekey_requested == 1)
+       {
+               rekey_requested = 0;
+               return 1;
+       }
        return
            (p_send.packets > MAX_PACKETS) ||
            (p_read.packets > MAX_PACKETS) ||