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

Return to kex.c CVS log

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

version 1.96, 2014/01/25 10:12:50

version 1.97, 2014/01/25 20:35:37

Line 489

need = dh_need = 0;

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

newkeys = kex->newkeys[mode];

if (need < newkeys->enc.key_len)

need = MAX(need, newkeys->enc.key_len);

need = newkeys->enc.key_len;

need = MAX(need, newkeys->enc.block_size);

if (need < newkeys->enc.block_size)

need = MAX(need, newkeys->enc.iv_len);

need = newkeys->enc.block_size;

need = MAX(need, newkeys->mac.key_len);

if (need < newkeys->enc.iv_len)

dh_need = MAX(dh_need, cipher_seclen(newkeys->enc.cipher));

need = newkeys->enc.iv_len;

dh_need = MAX(dh_need, newkeys->enc.block_size);

if (need < newkeys->mac.key_len)

dh_need = MAX(dh_need, newkeys->enc.iv_len);

need = newkeys->mac.key_len;

dh_need = MAX(dh_need, newkeys->mac.key_len);

if (dh_need < cipher_seclen(newkeys->enc.cipher))

dh_need = cipher_seclen(newkeys->enc.cipher);

}

/* XXX need runden? */

kex->we_need = need;