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

Use the payloads actual type in unknown_payload_t

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:43 +01:00
parent 9431023ce6
commit b6c796464d
6 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
+4 -5
View File
@@ -1273,7 +1273,7 @@ static status_t decrypt_payloads(private_message_t *this, aead_t *aead)
}
encryption->destroy(encryption);
}
if (type != UNKNOWN_PAYLOAD && !was_encrypted)
if (payload_is_known(type) && !was_encrypted)
{
rule = get_payload_rule(this, type);
if (!rule || rule->encrypted)
@@ -1315,14 +1315,13 @@ static status_t verify(private_message_t *this)
unknown_payload_t *unknown;
type = payload->get_type(payload);
if (type == UNKNOWN_PAYLOAD)
if (!payload_is_known(type))
{
/* unknown payloads are ignored if they are not critical */
unknown = (unknown_payload_t*)payload;
if (unknown->is_critical(unknown))
{
DBG1(DBG_ENC, "%N is not supported, but its critical!",
payload_type_names, type);
DBG1(DBG_ENC, "payload type %N is not supported, "
"but its critical!", payload_type_names, type);
enumerator->destroy(enumerator);
return NOT_SUPPORTED;
}