check for malformed IKE and ESP proposals

diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c
index 5b8294599e650758aa35d5462110939708d8391d..f680982d51b1c31fcaa7e4d77923ba553d04f1c7 100644 (file)
--- a/src/libcharon/config/proposal.c
+++ b/src/libcharon/config/proposal.c
@@ -560,6 +560,7 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
 
        if (token == NULL)
        {
+               DBG1(DBG_CFG, "algorithm '%.*s' not recognized", alg.len, alg.ptr);
                return FAILED;
        }
 

diff --git a/src/libcharon/plugins/sql/sql_config.c b/src/libcharon/plugins/sql/sql_config.c
index f81fc0b9e01ca17ff6998d7ecc235be0dba26eed..a4e718fbeafaf039a118d3216bfe40fe55d8bb71 100644 (file)
--- a/src/libcharon/plugins/sql/sql_config.c
+++ b/src/libcharon/plugins/sql/sql_config.c
@@ -140,6 +140,11 @@ static void add_esp_proposals(private_sql_config_t *this,
                while (e->enumerate(e, &prop))
                {
                        proposal = proposal_create_from_string(PROTO_ESP, prop);
+                       if (!proposal)
+                       {
+                               DBG1(DBG_CFG, "could not create ESP proposal from '%s'", prop);
+                               break;
+                       }
                        child->add_proposal(child, proposal);
                        use_default = FALSE;
                }
@@ -223,6 +228,11 @@ static void add_ike_proposals(private_sql_config_t *this,
                while (e->enumerate(e, &prop))
                {
                        proposal = proposal_create_from_string(PROTO_IKE, prop);
+                       if (!proposal)
+                       {
+                               DBG1(DBG_CFG, "could not create IKE proposal from '%s'", prop);
+                               break;
+                       }
                        ike_cfg->add_proposal(ike_cfg, proposal);
                        use_default = FALSE;
                }