encoding: Allow ke_payload_create_from_diffie_hellman() to fail

diff --git a/src/libcharon/encoding/payloads/ke_payload.h b/src/libcharon/encoding/payloads/ke_payload.h
index dfc6308b48e0ec58e377e07cdef3b0c94d3fc769..96c5096a5fba9782894ae4baa1f74b00cf8c82fe 100644 (file)
--- a/src/libcharon/encoding/payloads/ke_payload.h
+++ b/src/libcharon/encoding/payloads/ke_payload.h
@@ -73,7 +73,7 @@ ke_payload_t *ke_payload_create(payload_type_t type);
  *
  * @param type         PLV2_KEY_EXCHANGE or PLV1_KEY_EXCHANGE
  * @param dh           diffie hellman object containing group and key
- * @return                     ke_payload_t object
+ * @return                     ke_payload_t object, NULL on error
  */
 ke_payload_t *ke_payload_create_from_diffie_hellman(payload_type_t type,
                                                                                                        diffie_hellman_t *dh);

diff --git a/src/libcharon/sa/ikev1/phase1.c b/src/libcharon/sa/ikev1/phase1.c
index d01a831f82e77ae26c8f892c1aa6bc38500b0938..a81fa5886c45546785de0a6f0f2930e415222164 100644 (file)
--- a/src/libcharon/sa/ikev1/phase1.c
+++ b/src/libcharon/sa/ikev1/phase1.c
@@ -694,7 +694,13 @@ METHOD(phase1_t, add_nonce_ke, bool,
        nonce_gen_t *nonceg;
        chunk_t nonce;
 
-       ke_payload = ke_payload_create_from_diffie_hellman(PLV1_KEY_EXCHANGE, this->dh);
+       ke_payload = ke_payload_create_from_diffie_hellman(PLV1_KEY_EXCHANGE,
+                                                                                                          this->dh);
+       if (!ke_payload)
+       {
+               DBG1(DBG_IKE, "creating KE payload failed");
+               return FALSE;
+       }
        message->add_payload(message, &ke_payload->payload_interface);
 
        nonceg = this->keymat->keymat.create_nonce_gen(&this->keymat->keymat);

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 4b5b0160a1bf87328f4a72f354309b8d56d401b9..ac82452c87f5410d729c0f819d80890b8638ed09 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -465,12 +465,19 @@ static bool get_nonce(private_quick_mode_t *this, chunk_t *nonce,
 /**
  * Add KE payload to message
  */
-static void add_ke(private_quick_mode_t *this, message_t *message)
+static bool add_ke(private_quick_mode_t *this, message_t *message)
 {
        ke_payload_t *ke_payload;
 
-       ke_payload = ke_payload_create_from_diffie_hellman(PLV1_KEY_EXCHANGE, this->dh);
+       ke_payload = ke_payload_create_from_diffie_hellman(PLV1_KEY_EXCHANGE,
+                                                                                                          this->dh);
+       if (!ke_payload)
+       {
+               DBG1(DBG_IKE, "creating KE payload failed");
+               return FALSE;
+       }
        message->add_payload(message, &ke_payload->payload_interface);
+       return TRUE;
 }
 
 /**
@@ -880,7 +887,10 @@ METHOD(task_t, build_i, status_t,
                        }
                        if (group != MODP_NONE)
                        {
-                               add_ke(this, message);
+                               if (!add_ke(this, message))
+                               {
+                                       return FAILED;
+                               }
                        }
                        if (!this->tsi)
                        {
@@ -1218,7 +1228,10 @@ METHOD(task_t, build_r, status_t,
                        }
                        if (this->dh)
                        {
-                               add_ke(this, message);
+                               if (!add_ke(this, message))
+                               {
+                                       return FAILED;
+                               }
                        }
 
                        add_ts(this, message);

diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index 1bb9340022e136e532047e22e6a9de1896559dc9..7b1c44e7ef3ce817c01d83d41927122278823e28 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -716,7 +716,7 @@ static status_t select_and_install(private_child_create_t *this,
 /**
  * build the payloads for the message
  */
-static void build_payloads(private_child_create_t *this, message_t *message)
+static bool build_payloads(private_child_create_t *this, message_t *message)
 {
        sa_payload_t *sa_payload;
        nonce_payload_t *nonce_payload;
@@ -748,6 +748,11 @@ static void build_payloads(private_child_create_t *this, message_t *message)
        {
                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;
+               }
                message->add_payload(message, (payload_t*)ke_payload);
        }
 
@@ -776,6 +781,7 @@ static void build_payloads(private_child_create_t *this, message_t *message)
                message->add_notify(message, FALSE, ESP_TFC_PADDING_NOT_SUPPORTED,
                                                        chunk_empty);
        }
+       return TRUE;
 }
 
 /**
@@ -1035,7 +1041,10 @@ METHOD(task_t, build_i, status_t,
                                                        NARROW_INITIATOR_PRE_AUTH, this->tsi, this->tsr);
        }
 
-       build_payloads(this, message);
+       if (!build_payloads(this, message))
+       {
+               return FAILED;
+       }
 
        this->tsi->destroy_offset(this->tsi, offsetof(traffic_selector_t, destroy));
        this->tsr->destroy_offset(this->tsr, offsetof(traffic_selector_t, destroy));
@@ -1288,7 +1297,12 @@ METHOD(task_t, build_r, status_t,
                        return SUCCESS;
        }
 
-       build_payloads(this, message);
+       if (!build_payloads(this, message))
+       {
+               message->add_notify(message, FALSE, NO_PROPOSAL_CHOSEN, chunk_empty);
+               handle_child_sa_failure(this, message);
+               return SUCCESS;
+       }
 
        if (!this->rekey)
        {       /* invoke the child_up() hook if we are not rekeying */

diff --git a/src/libcharon/sa/ikev2/tasks/ike_init.c b/src/libcharon/sa/ikev2/tasks/ike_init.c
index ab3d57af66011531daa771ac7b8982d47bc12620..1f59296d973d456ac0e2f3de76893ff7b3445e31 100644 (file)
--- 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;
 }