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.11 and 1.12

version 1.11, 2000/10/11 04:02:17

version 1.12, 2000/10/11 20:27:23

Line 31

#include "buffer.h"

#include "bufaux.h"

#include "packet.h"

#include "cipher.h"

#include "compat.h"

#include <openssl/bn.h>

Line 395

Line 394

char *name = get_match(client, server);

if (name == NULL)

fatal("no matching cipher found: client %s server %s", client, server);

enc->type = cipher_number(name);

enc->cipher = cipher_by_name(name);

if (enc->cipher == NULL)

switch (enc->type) {

fatal("matching cipher is not supported: %s", name);

case SSH_CIPHER_3DES_CBC:

enc->key_len = 24;

enc->iv_len = 8;

enc->block_size = 8;

break;

case SSH_CIPHER_BLOWFISH_CBC:

case SSH_CIPHER_CAST128_CBC:

enc->key_len = 16;

enc->iv_len = 8;

enc->block_size = 8;

break;

case SSH_CIPHER_ARCFOUR:

enc->key_len = 16;

enc->iv_len = 0;

enc->block_size = 8;

break;

default:

fatal("unsupported cipher %s", name);

}

enc->name = name;

enc->enabled = 0;

enc->iv = NULL;

Line 513

Line 493

sprop[PROPOSAL_SERVER_HOST_KEY_ALGS]);

need = 0;

for (mode = 0; mode < MODE_MAX; mode++) {

if (need < k->enc[mode].key_len)

if (need < k->enc[mode].cipher->key_len)

need = k->enc[mode].key_len;

need = k->enc[mode].cipher->key_len;

if (need < k->enc[mode].iv_len)

if (need < k->enc[mode].cipher->block_size)

need = k->enc[mode].iv_len;

need = k->enc[mode].cipher->block_size;

if (need < k->mac[mode].key_len)

need = k->mac[mode].key_len;

}