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

Detect oversize SWID tags

Browse Source
This commit is contained in:
Andreas Steffen
2014-05-31 20:37:57 +02:00
parent ed27e0e7c7
commit a5ce2f0b23
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/plugins/imc_swid/imc_swid.c
+14 -3
View File
@@ -138,7 +138,7 @@ static bool add_swid_inventory(imc_state_t *state, imc_msg_t *msg,
uint32_t request_id, bool full_tags, uint32_t request_id, bool full_tags,
swid_inventory_t *targets) swid_inventory_t *targets)
{ {
pa_tnc_attr_t *attr, *attr_angel; pa_tnc_attr_t *attr, *attr_angel, *attr_error;
imc_swid_state_t *swid_state; imc_swid_state_t *swid_state;
swid_inventory_t *swid_inventory; swid_inventory_t *swid_inventory;
char *swid_directory, *swid_generator; char *swid_directory, *swid_generator;
@@ -165,9 +165,9 @@ static bool add_swid_inventory(imc_state_t *state, imc_msg_t *msg,
targets, swid_pretty, swid_full)) targets, swid_pretty, swid_full))
{ {
swid_inventory->destroy(swid_inventory); swid_inventory->destroy(swid_inventory);
attr = swid_error_create(TCG_SWID_ERROR, request_id, attr_error = swid_error_create(TCG_SWID_ERROR, request_id,
0, "error in SWID tag collection"); 0, "error in SWID tag collection");
msg->add_attribute(msg, attr); msg->add_attribute(msg, attr_error);
return FALSE; return FALSE;
} }
DBG1(DBG_IMC, "collected %d SWID tag%s%s", DBG1(DBG_IMC, "collected %d SWID tag%s%s",
@@ -201,6 +201,17 @@ static bool add_swid_inventory(imc_state_t *state, imc_msg_t *msg,
encoding = tag->get_encoding(tag); encoding = tag->get_encoding(tag);
entry_size = 2 + tag_file_path.len + 4 + encoding.len; entry_size = 2 + tag_file_path.len + 4 + encoding.len;
/* Check for oversize tags that cannot be transported */
if (PA_TNC_ATTR_HEADER_SIZE + TCG_SWID_TAG_INV_MIN_SIZE +
entry_size > max_attr_size)
{
attr_error = swid_error_create(TCG_SWID_RESPONSE_TOO_LARGE,
request_id, max_attr_size,
"oversize SWID tag omitted");
msg->add_attribute(msg, attr_error);
continue;
}
if (attr_size + entry_size > max_attr_size) if (attr_size + entry_size > max_attr_size)
{ {
if (first) if (first)