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

Return to cipher.c CVS log

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

Diff for /src/usr.bin/ssh/cipher.c between version 1.68 and 1.69

version 1.68, 2004/01/23 19:26:33

version 1.69, 2004/06/21 17:36:31

Line 147

ciphers_valid(const char *names)

{

Cipher *c;

char *ciphers, *cp;

char *cipher_list, *cp;

char *p;

if (names == NULL || strcmp(names, "") == 0)

return 0;

ciphers = cp = xstrdup(names);

cipher_list = cp = xstrdup(names);

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

(p = strsep(&cp, CIPHER_SEP))) {

c = cipher_by_name(p);

if (c == NULL || c->number != SSH_CIPHER_SSH2) {

debug("bad cipher %s [%s]", p, names);

xfree(ciphers);

xfree(cipher_list);

return 0;

} else {

debug3("cipher ok: %s [%s]", p, names);

}

debug3("ciphers ok: [%s]", names);

xfree(ciphers);

xfree(cipher_list);

return 1;

}

Line 194

void

cipher_init(CipherContext *cc, Cipher *cipher,

const u_char *key, u_int keylen, const u_char *iv, u_int ivlen,

int encrypt)

int do_encrypt)

{

static int dowarn = 1;

const EVP_CIPHER *type;

Line 223

EVP_CIPHER_CTX_init(&cc->evp);

if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv,

(encrypt == CIPHER_ENCRYPT)) == 0)

(do_encrypt == CIPHER_ENCRYPT)) == 0)

fatal("cipher_init: EVP_CipherInit failed for %s",

cipher->name);

klen = EVP_CIPHER_CTX_key_length(&cc->evp);

Line 261

void

cipher_set_key_string(CipherContext *cc, Cipher *cipher,

const char *passphrase, int encrypt)

const char *passphrase, int do_encrypt)

{

MD5_CTX md;

u_char digest[16];

Line 270

MD5_Update(&md, (const u_char *)passphrase, strlen(passphrase));

MD5_Final(digest, &md);

cipher_init(cc, cipher, digest, 16, NULL, 0, encrypt);

cipher_init(cc, cipher, digest, 16, NULL, 0, do_encrypt);

memset(digest, 0, sizeof(digest));

memset(&md, 0, sizeof(md));