From 3c11352ebb6417051afe7f806e7573b7c3caea92 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Wed, 3 Jun 2015 10:23:53 +0200 Subject: update few files not correctly updated by import-orig --- src/charon-tkm/src/tkm/tkm_kernel_sad.c | 13 ------------- src/libcharon/sa/ikev2/tasks/child_create.c | 7 ------- 2 files changed, 20 deletions(-) (limited to 'src') diff --git a/src/charon-tkm/src/tkm/tkm_kernel_sad.c b/src/charon-tkm/src/tkm/tkm_kernel_sad.c index c6eda0091..2556f6b8b 100644 --- a/src/charon-tkm/src/tkm/tkm_kernel_sad.c +++ b/src/charon-tkm/src/tkm/tkm_kernel_sad.c @@ -151,19 +151,6 @@ static bool sad_entry_match_other_esa(sad_entry_t * const entry, entry->esa_id != *esa_id; } -/** - * Find a list entry with given reqid, spi and proto values. - */ -static bool sad_entry_match_dst(sad_entry_t * const entry, - const u_int32_t * const reqid, - const u_int32_t * const spi, - const u_int8_t * const proto) -{ - return entry->reqid == *reqid && - entry->spi == *spi && - entry->proto == *proto; -} - /** * Compare two SAD entries for equality. */ diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c index 6bae960ad..e0f930c3c 100644 --- a/src/libcharon/sa/ikev2/tasks/child_create.c +++ b/src/libcharon/sa/ikev2/tasks/child_create.c @@ -1209,13 +1209,6 @@ METHOD(task_t, build_r, status_t, chunk_empty); return SUCCESS; } - if (this->dh_failed) - { - DBG1(DBG_IKE, "applying DH public value failed"); - message->add_notify(message, FALSE, NO_PROPOSAL_CHOSEN, - chunk_empty); - return SUCCESS; - } no_dh = FALSE; break; case IKE_AUTH: -- cgit v1.2.3