From e1d78dc2faaa06e7c3f71ef674a71e4de2f0758e Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@corsac.net>
Date: Tue, 21 Nov 2017 10:22:31 +0100
Subject: New upstream version 5.6.1

---
 src/libimcv/plugins/imc_swima/Makefile.in                     |  2 ++
 src/libimcv/plugins/imc_swima/imc_swima.c                     | 10 +++++-----
 .../imc_swima/strongswan.org__strongSwan-5-6-0.swidtag        | 11 -----------
 .../imc_swima/strongswan.org__strongSwan-5-6-1.swidtag        | 11 +++++++++++
 4 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-0.swidtag
 create mode 100644 src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-1.swidtag

(limited to 'src/libimcv/plugins/imc_swima')

diff --git a/src/libimcv/plugins/imc_swima/Makefile.in b/src/libimcv/plugins/imc_swima/Makefile.in
index ae1d024af..ed2191921 100644
--- a/src/libimcv/plugins/imc_swima/Makefile.in
+++ b/src/libimcv/plugins/imc_swima/Makefile.in
@@ -245,9 +245,11 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FUZZING_LDFLAGS = @FUZZING_LDFLAGS@
 GEM = @GEM@
 GENHTML = @GENHTML@
 GPERF = @GPERF@
+GPERF_LEN_TYPE = @GPERF_LEN_TYPE@
 GPRBUILD = @GPRBUILD@
 GREP = @GREP@
 INSTALL = @INSTALL@
diff --git a/src/libimcv/plugins/imc_swima/imc_swima.c b/src/libimcv/plugins/imc_swima/imc_swima.c
index e120cf7fc..67080e050 100644
--- a/src/libimcv/plugins/imc_swima/imc_swima.c
+++ b/src/libimcv/plugins/imc_swima/imc_swima.c
@@ -35,7 +35,7 @@
 static const char imc_name[] = "SWIMA";
 
 static pen_type_t msg_types[] = {
-	{ PEN_IETF, PA_SUBTYPE_IETF_SW }
+	{ PEN_IETF, PA_SUBTYPE_IETF_SWIMA }
 };
 
 static imc_agent_t *imc_swima;
@@ -180,7 +180,7 @@ static void fulfill_request(imc_state_t *state, imc_msg_t *msg,
 		{
 			snprintf(error_msg, msg_len, "failed to collect SW%s events, "
 					 "fallback to SW%s inventory", id_str, id_str);
-			attr = swima_error_create(PA_ERROR_SW, request_id, 0, error_msg);
+			attr = swima_error_create(PA_ERROR_SWIMA, request_id, 0, error_msg);
 			msg->add_attribute(msg, attr);
 		}
 		else {
@@ -207,7 +207,7 @@ static void fulfill_request(imc_state_t *state, imc_msg_t *msg,
 		{
 			snprintf(error_msg, msg_len, "failed to collect SW%s inventory",
 					 id_str);
-			attr = swima_error_create(PA_ERROR_SW, request_id, 0, error_msg);
+			attr = swima_error_create(PA_ERROR_SWIMA, request_id, 0, error_msg);
 		}
 		else
 		{
@@ -258,7 +258,7 @@ static TNC_Result receive_message(imc_state_t *state, imc_msg_t *in_msg)
 
 		type = attr->get_type(attr);
 
-		if (type.vendor_id != PEN_IETF || type.type != IETF_ATTR_SW_REQUEST)
+		if (type.vendor_id != PEN_IETF || type.type != IETF_ATTR_SWIMA_REQUEST)
 		{
 			continue;
 		}
@@ -270,7 +270,7 @@ static TNC_Result receive_message(imc_state_t *state, imc_msg_t *in_msg)
 
 		if (flags & (IETF_SWIMA_ATTR_REQ_FLAG_S | IETF_SWIMA_ATTR_REQ_FLAG_C))
 		{
-			attr = swima_error_create(PA_ERROR_SW_SUBSCRIPTION_DENIED,
+			attr = swima_error_create(PA_ERROR_SWIMA_SUBSCRIPTION_DENIED,
 						request_id, 0, "no subscription available yet");
 			out_msg->add_attribute(out_msg, attr);
 			break;
diff --git a/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-0.swidtag b/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-0.swidtag
deleted file mode 100644
index 644c0989c..000000000
--- a/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-0.swidtag
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<SoftwareIdentity
-  name="strongSwan"
-  tagId="strongSwan-5-6-0"
-  version="5.6.0" versionScheme="alphanumeric"
-  xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd">
-  <Entity
-    name="strongSwan Project"
-    regid="strongswan.org"
-    role="softwareCreator licensor tagCreator"/>
-</SoftwareIdentity>
diff --git a/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-1.swidtag b/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-1.swidtag
new file mode 100644
index 000000000..f10740d60
--- /dev/null
+++ b/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-6-1.swidtag
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SoftwareIdentity
+  name="strongSwan"
+  tagId="strongSwan-5-6-1"
+  version="5.6.1" versionScheme="alphanumeric"
+  xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd">
+  <Entity
+    name="strongSwan Project"
+    regid="strongswan.org"
+    role="softwareCreator licensor tagCreator"/>
+</SoftwareIdentity>
-- 
cgit v1.2.3