- New upstream release.

- Don't disable internal crypto plugins, pluto expects to find them in
  some cases.
- Enable integrity checking.

1 files changed, 0 insertions, 30 deletions

diff --git a/src/charon/config/child_cfg.c b/src/charon/config/child_cfg.c
index 43e41671a..990ee3fd6 100644
--- a/src/charon/config/child_cfg.c
+++ b/src/charon/config/child_cfg.c
@@ -345,35 +345,6 @@ static linked_list_t* get_traffic_selectors(private_child_cfg_t *this, bool loca
 }
 
 /**
- * Implementation of child_cfg_t.equal_traffic_selectors.
- */
-bool equal_traffic_selectors(private_child_cfg_t *this, bool local,
-							 linked_list_t *ts_list, host_t *host)
-{
-	linked_list_t *this_list;
-	traffic_selector_t *this_ts, *ts;
-	bool result;
-
-	this_list = (local) ? this->my_ts : this->other_ts;
-
-	/* currently equality is established for single traffic selectors only */
-	if (this_list->get_count(this_list) != 1 || ts_list->get_count(ts_list) != 1)
-	{
-		return FALSE;
-	}
-
-	this_list->get_first(this_list, (void**)&this_ts);
-	this_ts = this_ts->clone(this_ts);
-	this_ts->set_address(this_ts, host);
-	ts_list->get_first(ts_list, (void**)&ts);
-
-	result = ts->equals(ts, this_ts);
-
-	this_ts->destroy(this_ts);
-	return result;
-}
-
-/**
  * Implementation of child_cfg_t.get_updown.
  */
 static char* get_updown(private_child_cfg_t *this)
@@ -525,7 +496,6 @@ child_cfg_t *child_cfg_create(char *name, u_int32_t lifetime,
 	this->public.get_name = (char* (*) (child_cfg_t*))get_name;
 	this->public.add_traffic_selector = (void (*)(child_cfg_t*,bool,traffic_selector_t*))add_traffic_selector;
 	this->public.get_traffic_selectors = (linked_list_t*(*)(child_cfg_t*,bool,linked_list_t*,host_t*))get_traffic_selectors;
-	this->public.equal_traffic_selectors = (bool (*)(child_cfg_t*,bool,linked_list_t*,host_t*))equal_traffic_selectors;
 	this->public.add_proposal = (void (*) (child_cfg_t*,proposal_t*))add_proposal;
 	this->public.get_proposals = (linked_list_t* (*) (child_cfg_t*,bool))get_proposals;
 	this->public.select_proposal = (proposal_t* (*) (child_cfg_t*,linked_list_t*,bool))select_proposal;