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

Return to sshconnect2.c CVS log

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

Diff for /src/usr.bin/ssh/sshconnect2.c between version 1.56 and 1.57

version 1.56, 2001/03/26 08:07:09

version 1.57, 2001/03/27 17:46:49

Line 46

#include "sshconnect.h"

#include "authfile.h"

#include "cli.h"

#include "dh.h"

#include "dispatch.h"

#include "authfd.h"

#include "log.h"

Line 309

Line 310

int plen, dlen;

u_int klen, kout;

char *signature = NULL;

u_int slen, nbits;

u_int slen, nbits, min, max;

char *server_host_key_blob = NULL;

Key *server_host_key;

u_int sbloblen;

Line 322

Line 323

nbits = dh_estimate(kex->we_need * 8);

debug("Sending SSH2_MSG_KEX_DH_GEX_REQUEST.");

if (datafellows & SSH_OLD_DHGEX) {

packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST);

debug("Sending SSH2_MSG_KEX_DH_GEX_REQUEST_OLD.");

packet_put_int(nbits);

/* Old GEX request */

packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST_OLD);

packet_put_int(nbits);

min = DH_GRP_MIN;

max = DH_GRP_MAX;

} else {

debug("Sending SSH2_MSG_KEX_DH_GEX_REQUEST.");

/* New GEX request */

min = DH_GRP_MIN;

max = MIN(DH_GRP_MAX, nbits * 1.25);

packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST);

packet_put_int(min);

packet_put_int(nbits);

packet_put_int(max);

}

packet_send();

packet_write_wait();

#ifdef DEBUG_KEXDH

fprintf(stderr, "\nnbits = %d", nbits);

fprintf(stderr, "\nmin = %d, nbits = %d, max = %d", min, nbits, max);

#endif

debug("Wait SSH2_MSG_KEX_DH_GEX_GROUP.");

Line 344

Line 362

if ((g = BN_new()) == NULL)

fatal("BN_new");

packet_get_bignum2(g, &dlen);

if (BN_num_bits(p) < min || BN_num_bits(p) > max)

fatal("DH_GEX group out of range: %d !< %d !< %d",

min, BN_num_bits(p), max);

dh = dh_new_group(g, p);

dh_gen_key(dh, kex->we_need * 8);