diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2014-01-23 21:56:35 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2014-01-23 21:56:35 +0800 |
| commit | 8128b15e4157abc382f360eaf95c0fabefe5bc61 (patch) | |
| tree | 3641a48821e6eeaae375238fab58e85281668e4a /common-kex.c | |
| parent | 8081b0e03399c608dcbe8ebe187e9017886a0c34 (diff) | |
Fix failing rekeying when we receive a still-in-flight packet
Diffstat (limited to 'common-kex.c')
| -rw-r--r-- | common-kex.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/common-kex.c b/common-kex.c index b318515..3c1e604 100644 --- a/common-kex.c +++ b/common-kex.c @@ -483,9 +483,6 @@ static void gen_new_zstream_trans() { * and we calculate the first portion of the key-exchange-hash for used * later in the key exchange. No response is sent, as the client should * initiate the diffie-hellman key exchange */ - -/* Originally from kex.c, generalized for cli/svr mode --mihnea */ -/* Belongs in common_kex.c where it should be moved after review */ void recv_msg_kexinit() { unsigned int kexhashbuf_len = 0; @@ -528,7 +525,7 @@ void recv_msg_kexinit() { /* I_S, the payload of the server's SSH_MSG_KEXINIT */ buf_setpos(ses.payload, 0); buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len); - + ses.requirenext[0] = SSH_MSG_KEXDH_REPLY; } else { /* SERVER */ |