From 61e2a1ad8a6a3ea2d4a4c6f5298d685b9dcde60c Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 30 Nov 2011 17:04:21 +0100 Subject: [PATCH] Create negotiated hasher earlier during Main Mode so it is available for building NAT-D payloads. --- src/libcharon/sa/tasks/main_mode.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libcharon/sa/tasks/main_mode.c b/src/libcharon/sa/tasks/main_mode.c index a88f7a419..4d4ca340a 100644 --- a/src/libcharon/sa/tasks/main_mode.c +++ b/src/libcharon/sa/tasks/main_mode.c @@ -376,6 +376,10 @@ METHOD(task_t, build_i, status_t, { u_int16_t group; + if (!this->keymat->create_hasher(this->keymat, this->proposal)) + { + return FAILED; + } if (!this->proposal->get_algorithm(this->proposal, DIFFIE_HELLMAN_GROUP, &group, NULL)) { @@ -470,6 +474,10 @@ METHOD(task_t, process_r, status_t, { u_int16_t group; + if (!this->keymat->create_hasher(this->keymat, this->proposal)) + { + return FAILED; + } if (!this->proposal->get_algorithm(this->proposal, DIFFIE_HELLMAN_GROUP, &group, NULL)) {