Mercurial > dropbear

comparison common-kex.c @ 886:cbc73a5aefb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
requirenext doesn't need two values
author Matt Johnston <matt@ucc.asn.au>
date Thu, 23 Jan 2014 22:25:52 +0800
parents 19ce21bd198a
children 4a74c58e11fc
comparison
equal deleted inserted replaced
885:19ce21bd198a 886:cbc73a5aefb0
523 buf_putstring(ses.kexhashbuf, 523 buf_putstring(ses.kexhashbuf,
524 ses.transkexinit->data, ses.transkexinit->len); 524 ses.transkexinit->data, ses.transkexinit->len);
525 /* I_S, the payload of the server's SSH_MSG_KEXINIT */ 525 /* I_S, the payload of the server's SSH_MSG_KEXINIT */
526 buf_setpos(ses.payload, 0); 526 buf_setpos(ses.payload, 0);
527 buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len); 527 buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len);
528 ses.requirenext[0] = SSH_MSG_KEXDH_REPLY; 528 ses.requirenext = SSH_MSG_KEXDH_REPLY;
529 } else { 529 } else {
530 /* SERVER */ 530 /* SERVER */
531 531
532 /* read the peer's choice of algos */ 532 /* read the peer's choice of algos */
533 read_kex_algos(); 533 read_kex_algos();
543 543
544 /* I_S, the payload of the server's SSH_MSG_KEXINIT */ 544 /* I_S, the payload of the server's SSH_MSG_KEXINIT */
545 buf_putstring(ses.kexhashbuf, 545 buf_putstring(ses.kexhashbuf,
546 ses.transkexinit->data, ses.transkexinit->len); 546 ses.transkexinit->data, ses.transkexinit->len);
547 547
548 ses.requirenext[0] = SSH_MSG_KEXDH_INIT; 548 ses.requirenext = SSH_MSG_KEXDH_INIT;
549 } 549 }
550 550
551 buf_free(ses.transkexinit); 551 buf_free(ses.transkexinit);
552 ses.transkexinit = NULL; 552 ses.transkexinit = NULL;
553 /* the rest of ses.kexhashbuf will be done after DH exchange */ 553 /* the rest of ses.kexhashbuf will be done after DH exchange */