From 2a26566ed33281a60d06aa86da50fce136f7c685 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Tue, 12 Jun 2018 18:09:12 +0200 Subject: [PATCH] libimcv: Implementation of RFC 8412 SWIMA --- NEWS | 3 +++ src/libimcv/ietf/ietf_attr.h | 4 ++-- src/libimcv/ietf/ietf_attr_pa_tnc_error.h | 2 +- src/libimcv/ietf/swima/ietf_swima_attr_req.c | 4 ++-- src/libimcv/ietf/swima/ietf_swima_attr_sw_ev.c | 2 +- src/libimcv/ietf/swima/ietf_swima_attr_sw_inv.c | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 99953148e0..8fd7f6e75b 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ strongswan-5.7.0 - The pki tool accepts a xmppAddr otherName as a subjectAlternativeName using the syntax --san xmppaddr:. +- Implementation of RFC 8412 "Software Inventory Message and Attributes (SWIMA) + for PA-TNC" + strongswan-5.6.3 ---------------- diff --git a/src/libimcv/ietf/ietf_attr.h b/src/libimcv/ietf/ietf_attr.h index 6e264bc925..0f802fd453 100644 --- a/src/libimcv/ietf/ietf_attr.h +++ b/src/libimcv/ietf/ietf_attr.h @@ -32,7 +32,7 @@ typedef enum ietf_attr_t ietf_attr_t; */ enum ietf_attr_t { - /* RFC 5792 */ + /* RFC 5792 PA-TNC */ IETF_ATTR_TESTING = 0, IETF_ATTR_ATTRIBUTE_REQUEST = 1, IETF_ATTR_PRODUCT_INFORMATION = 2, @@ -47,7 +47,7 @@ enum ietf_attr_t { IETF_ATTR_FORWARDING_ENABLED = 11, IETF_ATTR_FACTORY_DEFAULT_PWD_ENABLED = 12, - /* draft-ietf-sacm-nea-swid-patnc */ + /* RFC 8412 SWIMA */ IETF_ATTR_SWIMA_REQUEST = 13, IETF_ATTR_SW_ID_INVENTORY = 14, IETF_ATTR_SW_ID_EVENTS = 15, diff --git a/src/libimcv/ietf/ietf_attr_pa_tnc_error.h b/src/libimcv/ietf/ietf_attr_pa_tnc_error.h index ee2a92c4ea..d5cba97b64 100644 --- a/src/libimcv/ietf/ietf_attr_pa_tnc_error.h +++ b/src/libimcv/ietf/ietf_attr_pa_tnc_error.h @@ -39,7 +39,7 @@ enum pa_tnc_error_code_t { PA_ERROR_ATTR_TYPE_NOT_SUPPORTED = 3, PA_ERROR_PA_TNC_MSG_ROOF = 3, - /* draft-ietf-sacm-nea-swid-patnc (SWIMA) */ + /* RFC 8412 SWIMA */ PA_ERROR_SWIMA = 4, PA_ERROR_SWIMA_SUBSCRIPTION_DENIED = 5, PA_ERROR_SWIMA_RESPONSE_TOO_LARGE = 6, diff --git a/src/libimcv/ietf/swima/ietf_swima_attr_req.c b/src/libimcv/ietf/swima/ietf_swima_attr_req.c index d67497373f..12212ec186 100644 --- a/src/libimcv/ietf/swima/ietf_swima_attr_req.c +++ b/src/libimcv/ietf/swima/ietf_swima_attr_req.c @@ -26,7 +26,7 @@ typedef struct private_ietf_swima_attr_req_t private_ietf_swima_attr_req_t; /** * SW Request - * see section 5.7 of IETF SW Inventory Message and Attributes for PA-TNC + * see section 5.7 of RFC 8412 SWIMA * * 1 2 3 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 @@ -191,7 +191,7 @@ METHOD(pa_tnc_attr_t, process, status_t, return FAILED; } *offset += 2 + sw_id.len; - + sw_record = swima_record_create(0, sw_id, chunk_empty); this->targets->add(this->targets, sw_record); } diff --git a/src/libimcv/ietf/swima/ietf_swima_attr_sw_ev.c b/src/libimcv/ietf/swima/ietf_swima_attr_sw_ev.c index cebc998e2f..47f4995186 100644 --- a/src/libimcv/ietf/swima/ietf_swima_attr_sw_ev.c +++ b/src/libimcv/ietf/swima/ietf_swima_attr_sw_ev.c @@ -27,7 +27,7 @@ typedef struct private_ietf_swima_attr_sw_ev_t private_ietf_swima_attr_sw_ev_t; /** * Software [Identifier] Events - * see sections 5.9/5.11 of IETF SW Inventory Message and Attributes for PA-TNC + * see sections 5.9/5.11 of RFC 8412 SWIMA * * 1 2 3 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 diff --git a/src/libimcv/ietf/swima/ietf_swima_attr_sw_inv.c b/src/libimcv/ietf/swima/ietf_swima_attr_sw_inv.c index a6c1d28b21..8035dbb074 100644 --- a/src/libimcv/ietf/swima/ietf_swima_attr_sw_inv.c +++ b/src/libimcv/ietf/swima/ietf_swima_attr_sw_inv.c @@ -26,7 +26,7 @@ typedef struct private_ietf_swima_attr_sw_inv_t private_ietf_swima_attr_sw_inv_t /** * Software [Identifier] Inventory - * see sections 5.8/5.10 of IETF SW Inventory Message and Attributes for PA-TNC + * see sections 5.8/5.10 of RFC 8412 SWIMA * * 1 2 3 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 -- 2.47.2