New upstream version 5.6.0

12 files changed, 83 insertions, 9 deletions

diff --git a/conf/plugins/curl.conf b/conf/plugins/curl.conf
new file mode 100644
index 000000000..9ba042097
--- /dev/null
+++ b/conf/plugins/curl.conf
@@ -0,0 +1,12 @@
+curl {
+
+    # Whether to load the plugin. Can also be an integer to increase the
+    # priority of this plugin.
+    load = yes
+
+    # Maximum number of redirects followed by the plugin, set to 0 to disable
+    # following redirects, set to -1 for no limit.
+    # redir = -1
+
+}
+
diff --git a/conf/plugins/curl.opt b/conf/plugins/curl.opt
new file mode 100644
index 000000000..90efa12f4
--- /dev/null
+++ b/conf/plugins/curl.opt
@@ -0,0 +1,3 @@
+charon.plugins.curl.redir = -1
+	Maximum number of redirects followed by the plugin, set to 0 to disable
+	following redirects, set to -1 for no limit.
diff --git a/conf/plugins/eap-aka-3ggp2.opt b/conf/plugins/eap-aka-3ggp2.opt
deleted file mode 100644
index 9e2a42b3f..000000000
--- a/conf/plugins/eap-aka-3ggp2.opt
+++ /dev/null
@@ -1 +0,0 @@
-charon.plugins.eap-aka-3ggp2.seq_check =
diff --git a/conf/plugins/eap-aka-3gpp.conf b/conf/plugins/eap-aka-3gpp.conf
new file mode 100644
index 000000000..4164535c4
--- /dev/null
+++ b/conf/plugins/eap-aka-3gpp.conf
@@ -0,0 +1,12 @@
+eap-aka-3gpp {
+
+    # Whether to load the plugin. Can also be an integer to increase the
+    # priority of this plugin.
+    load = yes
+
+    # Enable to activate sequence check of the AKA SQN values in order to
+    # trigger resync cycles.
+    # seq_check =
+
+}
+
diff --git a/conf/plugins/eap-aka-3gpp.opt b/conf/plugins/eap-aka-3gpp.opt
new file mode 100644
index 000000000..1bc733ab1
--- /dev/null
+++ b/conf/plugins/eap-aka-3gpp.opt
@@ -0,0 +1,3 @@
+charon.plugins.eap-aka-3gpp.seq_check =
+	Enable to activate sequence check of the AKA SQN values	in order to trigger
+	resync cycles.
diff --git a/conf/plugins/eap-aka-3gpp2.conf b/conf/plugins/eap-aka-3gpp2.conf
new file mode 100644
index 000000000..3f329aec5
--- /dev/null
+++ b/conf/plugins/eap-aka-3gpp2.conf
@@ -0,0 +1,12 @@
+eap-aka-3gpp2 {
+
+    # Whether to load the plugin. Can also be an integer to increase the
+    # priority of this plugin.
+    load = yes
+
+    # Enable to activate sequence check of the AKA SQN values in order to
+    # trigger resync cycles.
+    # seq_check =
+
+}
+
diff --git a/conf/plugins/eap-aka-3gpp2.opt b/conf/plugins/eap-aka-3gpp2.opt
new file mode 100644
index 000000000..679c386b8
--- /dev/null
+++ b/conf/plugins/eap-aka-3gpp2.opt
@@ -0,0 +1,4 @@
+charon.plugins.eap-aka-3gpp2.seq_check =
+	Enable to activate sequence check of the AKA SQN values in order to trigger
+	resync cycles.
+
diff --git a/conf/plugins/imc-swid.opt b/conf/plugins/imc-swid.opt
index 74490c179..e622aa683 100644
--- a/conf/plugins/imc-swid.opt
+++ b/conf/plugins/imc-swid.opt
@@ -1,11 +1,8 @@
 libimcv.plugins.imc-swid.swid_directory = ${prefix}/share
 	Directory where SWID tags are located.
 
-libimcv.plugins.imc-swid.swid_generator = /usr/local/bin/swid_generator
-	SWID generator command to be executed.
-
-libimcv.plugins.imc-swid.swid_pretty = FALSE
+libimcv.plugins.imc-swid.swid_pretty = no
 	Generate XML-encoded SWID tags with pretty indentation.
 
-libimcv.plugins.imc-swid.swid_full = FALSE
+libimcv.plugins.imc-swid.swid_full = no
 	Include file information in the XML-encoded SWID tags.
diff --git a/conf/plugins/eap-aka-3ggp2.conf b/conf/plugins/imc-swima.conf
index c52c99609..0d1e88a5d 100644
--- a/conf/plugins/eap-aka-3ggp2.conf
+++ b/conf/plugins/imc-swima.conf
@@ -1,10 +1,8 @@
-eap-aka-3ggp2 {
+imc-swima {
 
     # Whether to load the plugin. Can also be an integer to increase the
     # priority of this plugin.
     load = yes
 
-    # seq_check =
-
 }
 
diff --git a/conf/plugins/imc-swima.opt b/conf/plugins/imc-swima.opt
new file mode 100644
index 000000000..099a3c80f
--- /dev/null
+++ b/conf/plugins/imc-swima.opt
@@ -0,0 +1,21 @@
+libimcv.plugins.imc-swima.eid_epoch = 0x11223344
+	Set 32 bit epoch value for event IDs manually if software collector database
+	is not available.
+
+libimcv.plugins.imc-swima.swid_database =
+	URI to software collector database containing event timestamps,	software
+	creation and deletion events and collected software identifiers.
+
+	URI to software collector database containing event timestamps,	software
+	creation and deletion events and collected software identifiers.
+	If it contains a password, make sure to adjust the permissions of the config
+	file accordingly.
+
+libimcv.plugins.imc-swima.swid_directory = ${prefix}/share
+	Directory where SWID tags are located.
+
+libimcv.plugins.imc-swima.swid_pretty = no
+	Generate XML-encoded SWID tags with pretty indentation.
+
+libimcv.plugins.imc-swima.swid_full = no
+	Include file information in the XML-encoded SWID tags.
diff --git a/conf/plugins/imv-swima.conf b/conf/plugins/imv-swima.conf
new file mode 100644
index 000000000..cde4e1a88
--- /dev/null
+++ b/conf/plugins/imv-swima.conf
@@ -0,0 +1,8 @@
+imv-swima {
+
+    # Whether to load the plugin. Can also be an integer to increase the
+    # priority of this plugin.
+    load = yes
+
+}
+
diff --git a/conf/plugins/imv-swima.opt b/conf/plugins/imv-swima.opt
new file mode 100644
index 000000000..a9ba96c21
--- /dev/null
+++ b/conf/plugins/imv-swima.opt
@@ -0,0 +1,5 @@
+libimcv.plugins.imv-swima.rest_api.uri =
+	HTTP URI of the SWID REST API.
+
+libimcv.plugins.imv-swima.rest_api.timeout = 120
+	Timeout of SWID REST API HTTP POST transaction.