src/usr.bin/ssh/kex.c - diff

Return to kex.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/kex.c between version 1.36.2.1 and 1.36.2.2

version 1.36.2.1, 2002/03/07 17:37:46

version 1.36.2.2, 2002/05/17 00:03:23

Line 40

#include "mac.h"

#include "match.h"

#include "dispatch.h"

#include "monitor.h"

#define KEX_COOKIE_LEN 16

/* Use privilege separation for sshd */

int use_privsep;

struct monitor *pmonitor;

/* prototype */

static void kex_kexinit_finish(Kex *);

static void kex_choose_conf(Kex *);

Line 51

Line 57

static void

kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX])

{

u_int32_t rand = 0;

int i;

buffer_clear(b);

for (i = 0; i < KEX_COOKIE_LEN; i++) {

if (i % 4 == 0)

* add a dummy cookie, the cookie will be overwritten by

rand = arc4random();

* kex_send_kexinit(), each time a kexinit is set

buffer_put_char(b, rand & 0xff);

rand >>= 8;

for (i = 0; i < KEX_COOKIE_LEN; i++)

}

buffer_put_char(b, 0);

for (i = 0; i < PROPOSAL_MAX; i++)

buffer_put_cstring(b, proposal[i]);

buffer_put_char(b, 0); /* first_kex_packet_follows */

Line 146

Line 151

void

kex_send_kexinit(Kex *kex)

{

u_int32_t rand = 0;

u_char *cookie;

int i;

if (kex == NULL) {

error("kex_send_kexinit: no kex, cannot rekey");

return;

Line 155

Line 164

return;

}

kex->done = 0;

/* generate a random cookie */

if (buffer_len(&kex->my) < KEX_COOKIE_LEN)

fatal("kex_send_kexinit: kex proposal too short");

cookie = buffer_ptr(&kex->my);

for (i = 0; i < KEX_COOKIE_LEN; i++) {

if (i % 4 == 0)

rand = arc4random();

cookie[i] = rand;

rand >>= 8;

}

packet_start(SSH2_MSG_KEXINIT);

packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my));

packet_send();