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

Return to sshconnect2.c CVS log

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

version 1.23, 2000/10/11 20:14:39

version 1.24, 2000/10/11 20:27:24

Line 37

#include "rsa.h"

#include "buffer.h"

#include "packet.h"

#include "cipher.h"

#include "uidswap.h"

#include "compat.h"

#include "readconf.h"

Line 76

Line 75

Buffer *client_kexinit, *server_kexinit;

char *sprop[PROPOSAL_MAX];

if (options.ciphers == NULL) {

if (options.cipher == SSH_CIPHER_3DES) {

options.ciphers = "3des-cbc";

} else if (options.cipher == SSH_CIPHER_BLOWFISH) {

options.ciphers = "blowfish-cbc";

}

if (options.ciphers != NULL) {

myproposal[PROPOSAL_ENC_ALGS_CTOS] =

myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;

} else if (options.cipher == SSH_CIPHER_3DES) {

myproposal[PROPOSAL_ENC_ALGS_CTOS] =

myproposal[PROPOSAL_ENC_ALGS_STOC] =

(char *) cipher_name(SSH_CIPHER_3DES_CBC);

} else if (options.cipher == SSH_CIPHER_BLOWFISH) {

myproposal[PROPOSAL_ENC_ALGS_CTOS] =

myproposal[PROPOSAL_ENC_ALGS_STOC] =

(char *) cipher_name(SSH_CIPHER_BLOWFISH_CBC);

}

if (options.compression) {

myproposal[PROPOSAL_COMP_ALGS_CTOS] = "zlib";

Line 313

Line 311

unsigned char *kbuf;

unsigned char *hash;

nbits = dh_estimate(kex->enc[MODE_OUT].key_len * 8);

nbits = dh_estimate(kex->enc[MODE_OUT].cipher->key_len * 8);

debug("Sending SSH2_MSG_KEX_DH_GEX_REQUEST.");

packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST);