proposal: Compare algorithms of all transform types for equality

This commit is contained in:
Tobias Brunner
2018-03-05 12:25:19 +01:00
parent 76c7c951e1
commit 6b8749ab18
2 changed files with 35 additions and 6 deletions
+17 -6
View File
@@ -527,16 +527,27 @@ METHOD(proposal_t, get_number, u_int,
METHOD(proposal_t, equals, bool,
private_proposal_t *this, proposal_t *other)
{
transform_type_t type;
array_t *types;
int i;
if (&this->public == other)
{
return TRUE;
}
return (
algo_list_equals(this, other, ENCRYPTION_ALGORITHM) &&
algo_list_equals(this, other, INTEGRITY_ALGORITHM) &&
algo_list_equals(this, other, PSEUDO_RANDOM_FUNCTION) &&
algo_list_equals(this, other, DIFFIE_HELLMAN_GROUP) &&
algo_list_equals(this, other, EXTENDED_SEQUENCE_NUMBERS));
types = merge_types(this, (private_proposal_t*)other);
for (i = 0; i < array_count(types); i++)
{
array_get(types, i, &type);
if (!algo_list_equals(this, other, type))
{
array_destroy(types);
return FALSE;
}
}
array_destroy(types);
return TRUE;
}
METHOD(proposal_t, clone_, proposal_t*,