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.22 and 1.23

version 1.22, 2001/03/05 17:17:20

version 1.23, 2001/03/10 17:51:04

Line 42

#include "key.h"

#include "log.h"

#include "mac.h"

#include "match.h"

#define KEX_COOKIE_LEN 16

Line 372

Line 373

return digest;

}

#define NKEYS 6

#define MAX_PROP 20

#define SEP ","

char *

get_match(char *client, char *server)

{

char *sproposals[MAX_PROP];

char *c, *s, *p, *ret, *cp, *sp;

int i, j, nproposals;

c = cp = xstrdup(client);

s = sp = xstrdup(server);

for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0';

(p = strsep(&sp, SEP)), i++) {

if (i < MAX_PROP)

sproposals[i] = p;

else

break;

}

nproposals = i;

for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0';

(p = strsep(&cp, SEP)), i++) {

for (j = 0; j < nproposals; j++) {

if (strcmp(p, sproposals[j]) == 0) {

ret = xstrdup(p);

xfree(c);

xfree(s);

return ret;

}

xfree(c);

xfree(s);

return NULL;

}

void

choose_enc(Enc *enc, char *client, char *server)

{

char *name = get_match(client, server);

char *name = match_list(client, server, NULL);

if (name == NULL)

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

enc->cipher = cipher_by_name(name);

Line 428

Line 390

void

choose_mac(Mac *mac, char *client, char *server)

{

char *name = get_match(client, server);

char *name = match_list(client, server, NULL);

if (name == NULL)

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

if (mac_init(mac, name) < 0)

Line 443

Line 405

void

choose_comp(Comp *comp, char *client, char *server)

{

char *name = get_match(client, server);

char *name = match_list(client, server, NULL);

if (name == NULL)

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

if (strcmp(name, "zlib") == 0) {

Line 458

Line 420

void

choose_kex(Kex *k, char *client, char *server)

{

k->name = get_match(client, server);

k->name = match_list(client, server, NULL);

if (k->name == NULL)

fatal("no kex alg");

if (strcmp(k->name, KEX_DH1) == 0) {

Line 471

Line 433

void

choose_hostkeyalg(Kex *k, char *client, char *server)

{

char *hostkeyalg = get_match(client, server);

char *hostkeyalg = match_list(client, server, NULL);

if (hostkeyalg == NULL)

fatal("no hostkey alg");

k->hostkey_type = key_type_from_name(hostkeyalg);

Line 524

Line 486

return k;

}

#define NKEYS 6

int

kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret)

{