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

Return to packet.c CVS log

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

version 1.146, 2007/05/31 23:34:29

version 1.147, 2007/06/05 06:52:37

Line 620

enc = &newkeys[mode]->enc;

mac = &newkeys[mode]->mac;

comp = &newkeys[mode]->comp;

memset(mac->key, 0, mac->key_len);

if (mac->md != NULL)

mac_clear(mac);

xfree(enc->name);

xfree(enc->iv);

xfree(enc->key);

Line 635

Line 636

enc = &newkeys[mode]->enc;

mac = &newkeys[mode]->mac;

comp = &newkeys[mode]->comp;

if (mac->md != NULL)

if (mac->md != NULL) {

mac_init(mac);

mac->enabled = 1;

}

DBG(debug("cipher_init_context: %d", mode));

cipher_init(cc, enc->cipher, enc->key, enc->key_len,

enc->iv, enc->block_size, crypt_type);

/* Deleting the keys does not gain extra security */

/* memset(enc->iv, 0, enc->block_size);

memset(enc->key, 0, enc->key_len); */

memset(enc->key, 0, enc->key_len);

memset(mac->key, 0, mac->key_len); */

if ((comp->type == COMP_ZLIB ||

(comp->type == COMP_DELAYED && after_authentication)) &&

comp->enabled == 0) {