diff options
| author | Martin Willi <martin@revosec.ch> | 2015-03-23 11:10:40 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-03-23 17:54:02 +0100 |
| commit | 520d58e0109ecd792c83eab72a3f3357ffc41ba0 (patch) | |
| tree | 9d349f6672cb2d3c3d2b3e2ec59fa5054b3d01dd /src/libcharon/sa/ikev2/tasks/ike_init.c | |
| parent | bace1d647971e8300c5abdb1e950adf3756ec328 (diff) | |
| download | strongswan-520d58e0109ecd792c83eab72a3f3357ffc41ba0.tar.bz2 strongswan-520d58e0109ecd792c83eab72a3f3357ffc41ba0.tar.xz | |
encoding: Allow ke_payload_create_from_diffie_hellman() to fail
Diffstat (limited to 'src/libcharon/sa/ikev2/tasks/ike_init.c')
| -rw-r--r-- | src/libcharon/sa/ikev2/tasks/ike_init.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/libcharon/sa/ikev2/tasks/ike_init.c b/src/libcharon/sa/ikev2/tasks/ike_init.c index ab3d57af6..1f59296d9 100644 --- a/src/libcharon/sa/ikev2/tasks/ike_init.c +++ b/src/libcharon/sa/ikev2/tasks/ike_init.c @@ -210,7 +210,7 @@ static void handle_supported_hash_algorithms(private_ike_init_t *this, /** * build the payloads for the message */ -static void build_payloads(private_ike_init_t *this, message_t *message) +static bool build_payloads(private_ike_init_t *this, message_t *message) { sa_payload_t *sa_payload; ke_payload_t *ke_payload; @@ -254,7 +254,13 @@ static void build_payloads(private_ike_init_t *this, message_t *message) nonce_payload = nonce_payload_create(PLV2_NONCE); nonce_payload->set_nonce(nonce_payload, this->my_nonce); - ke_payload = ke_payload_create_from_diffie_hellman(PLV2_KEY_EXCHANGE, this->dh); + ke_payload = ke_payload_create_from_diffie_hellman(PLV2_KEY_EXCHANGE, + this->dh); + if (!ke_payload) + { + DBG1(DBG_IKE, "creating KE payload failed"); + return FALSE; + } if (this->old_sa) { /* payload order differs if we are rekeying */ @@ -289,6 +295,7 @@ static void build_payloads(private_ike_init_t *this, message_t *message) send_supported_hash_algorithms(this, message); } } + return TRUE; } /** @@ -438,7 +445,10 @@ METHOD(task_t, build_i, status_t, message->add_notify(message, FALSE, COOKIE, this->cookie); } - build_payloads(this, message); + if (!build_payloads(this, message)) + { + return FAILED; + } #ifdef ME { @@ -572,7 +582,10 @@ METHOD(task_t, build_r, status_t, message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty); return FAILED; } - build_payloads(this, message); + if (!build_payloads(this, message)) + { + return FAILED; + } return SUCCESS; } |