comparison svr-kex.c @ 801:7dcb46da72d9 ecc

merge in HEAD
author Matt Johnston <matt@ucc.asn.au>
date Tue, 21 May 2013 12:09:35 +0800
parents 5503e05ab3a4 2f1c199b6e4b
children b298bb438625 6c69e7df3621
comparison
equal deleted inserted replaced
799:c344607b7341 801:7dcb46da72d9
69 if (ecdh_qs) { 69 if (ecdh_qs) {
70 buf_free(ecdh_qs); 70 buf_free(ecdh_qs);
71 } 71 }
72 72
73 send_msg_newkeys(); 73 send_msg_newkeys();
74 ses.requirenext = SSH_MSG_NEWKEYS; 74 ses.requirenext[0] = SSH_MSG_NEWKEYS;
75 ses.requirenext[1] = 0;
75 TRACE(("leave recv_msg_kexdh_init")) 76 TRACE(("leave recv_msg_kexdh_init"))
76 } 77 }
77 78
78 /* Generate our side of the diffie-hellman key exchange value (dh_f), and 79 /* Generate our side of the diffie-hellman key exchange value (dh_f), and
79 * calculate the session key using the diffie-hellman algorithm. Following 80 * calculate the session key using the diffie-hellman algorithm. Following