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

Return to sshconnect.c CVS log

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

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.66 and 1.67

version 1.66, 2000/04/12 09:39:10

version 1.67, 2000/04/14 10:09:16

Line 1400

debug("first kex follow == %d", i);

i = packet_get_int();

debug("reserved == %d", i);

packet_done();

debug("done read kexinit");

kex = kex_choose_conf(cprop, sprop, 0);

Line 1455

Line 1456

/* signed H */

signature = packet_get_string(&slen);

packet_done();

if (!dh_pub_is_valid(dh, dh_server_pub))

packet_disconnect("bad server public DH value");

Line 1507

Line 1509

debug("Wait SSH2_MSG_NEWKEYS.");

packet_read_expect(&payload_len, SSH2_MSG_NEWKEYS);

packet_done();

debug("GOT SSH2_MSG_NEWKEYS.");

debug("send SSH2_MSG_NEWKEYS.");

Line 1540

Line 1543

char *server_user, *local_user;

char *auths;

char *password;

char *service = "ssh-connection"; // service name

char *service = "ssh-connection"; /* service name */

debug("send SSH2_MSG_SERVICE_REQUEST");

packet_start(SSH2_MSG_SERVICE_REQUEST);

Line 1552

Line 1555

if (type != SSH2_MSG_SERVICE_ACCEPT) {

fatal("denied SSH2_MSG_SERVICE_ACCEPT: %d", type);

}

/* payload empty for ssh-2.0.13 ?? */

if (packet_remaining() > 0) {

/* reply = packet_get_string(&payload_len); */

char *reply = packet_get_string(&plen);

debug("service_accept: %s", reply);

xfree(reply);

} else {

/* payload empty for ssh-2.0.13 ?? */

log("buggy server: service_accept w/o service");

}

packet_done();

debug("got SSH2_MSG_SERVICE_ACCEPT");

/*XX COMMONCODE: */

Line 1582

Line 1592

auths = packet_get_string(&dlen);

debug("authentications that can continue: %s", auths);

partial = packet_get_char();

packet_done();

if (partial)

debug("partial success");

if (strstr(auths, "password") == NULL)

Line 1602

Line 1613

packet_send();

packet_write_wait();

}

packet_done();

debug("ssh-userauth2 successfull");

}