Attachment #3215 for bug #2942

View | Details | Raw Unified | Return to bug 2942
Collapse All | Expand All




		   (unsigned long long)state->p_read.blocks,
		   (unsigned long long)state->p_send.bytes,
		   (unsigned long long)state->p_send.blocks);
		cipher_free(*ccp);
		*ccp = NULL;
		kex_free_newkeys(state->newkeys[mode]);
		state->newkeys[mode] = NULL;
	}

	}
	mac->enabled = 1;
	DBG(debug("cipher_init_context: %d", mode));
	cipher_free(*ccp);
	*ccp = NULL;
	if ((r = cipher_init(ccp, enc->cipher, enc->key, enc->key_len,
	    enc->iv, enc->iv_len, crypt_type)) != 0)
		return r;

Return to bug 2942

Lines 858-865 ssh_set_newkeys(struct ssh *ssh, int mode) Link Here

(-)a/packet.c (-2 / +2 lines)
858	(unsigned long long)state->p_read.blocks,	858	(unsigned long long)state->p_read.blocks,
859	(unsigned long long)state->p_send.bytes,	859	(unsigned long long)state->p_send.bytes,
860	(unsigned long long)state->p_send.blocks);	860	(unsigned long long)state->p_send.blocks);
861	cipher_free(*ccp);
862	*ccp = NULL;
863	kex_free_newkeys(state->newkeys[mode]);	861	kex_free_newkeys(state->newkeys[mode]);
864	state->newkeys[mode] = NULL;	862	state->newkeys[mode] = NULL;
865	}	863	}
Lines 878-883 ssh_set_newkeys(struct ssh *ssh, int mode) Link Here
878	}	876	}
879	mac->enabled = 1;	877	mac->enabled = 1;
880	DBG(debug("cipher_init_context: %d", mode));	878	DBG(debug("cipher_init_context: %d", mode));
		879	cipher_free(*ccp);
		880	*ccp = NULL;
881	if ((r = cipher_init(ccp, enc->cipher, enc->key, enc->key_len,	881	if ((r = cipher_init(ccp, enc->cipher, enc->key, enc->key_len,
882	enc->iv, enc->iv_len, crypt_type)) != 0)	882	enc->iv, enc->iv_len, crypt_type)) != 0)
883	return r;	883	return r;