diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-01 09:50:30 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-12-01 09:50:30 +0100 |
| commit | a072c34a634456899dae18600ff7a826369ddbd6 (patch) | |
| tree | 26cb2c82d36a35232528d6ea46b6493747815358 /src | |
| parent | e79567d07eabbbb703a9598413b880cc319c5357 (diff) | |
| download | strongswan-a072c34a634456899dae18600ff7a826369ddbd6.tar.bz2 strongswan-a072c34a634456899dae18600ff7a826369ddbd6.tar.xz | |
check for malformed IKE and ESP proposals
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/config/proposal.c | 1 | ||||
| -rw-r--r-- | src/libcharon/plugins/sql/sql_config.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c index 5b8294599..f680982d5 100644 --- 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 f81fc0b9e..a4e718fbe 100644 --- 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; } |