denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for exceeded payload count even if we have a found one flagged as sufficient

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:43 +01:00
parent 9b2ed9501f
commit fea3aa5d12
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
+4 -3
View File
@@ -1295,6 +1295,7 @@ static status_t decrypt_payloads(private_message_t *this, aead_t *aead)
*/ */
static status_t verify(private_message_t *this) static status_t verify(private_message_t *this)
{ {
bool complete = FALSE;
int i; int i;
DBG2(DBG_ENC, "verifying message structure"); DBG2(DBG_ENC, "verifying message structure");
@@ -1343,15 +1344,15 @@ static status_t verify(private_message_t *this)
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (found < rule->min_occurence) if (!complete && found < rule->min_occurence)
{ {
DBG1(DBG_ENC, "payload of type %N not occured %d times (%d)", DBG1(DBG_ENC, "payload of type %N not occured %d times (%d)",
payload_type_names, rule->type, rule->min_occurence, found); payload_type_names, rule->type, rule->min_occurence, found);
return VERIFY_ERROR; return VERIFY_ERROR;
} }
if (rule->sufficient) if (found && rule->sufficient)
{ {
return SUCCESS; complete = TRUE;
} }
} }
return SUCCESS; return SUCCESS;