New upstream version 5.7.0

4 files changed, 25 insertions, 13 deletions

diff --git a/conf/options/charon-logging.conf b/conf/options/charon-logging.conf
index 454405985..ed3c027dc 100644
--- a/conf/options/charon-logging.conf
+++ b/conf/options/charon-logging.conf
@@ -4,8 +4,10 @@ charon {
     # strongswan.conf(5).
     filelog {
 
-        # <filename> is the full path to the log file.
-        # <filename> {
+        # <name> may be the full path to the log file if it only contains
+        # characters permitted in section names. Is ignored if path is
+        # specified.
+        # <name> {
 
             # Loglevel for a specific subsystem.
             # <subsystem> = <default>
@@ -25,6 +27,11 @@ charon {
             # numerical identifier for each IKE_SA.
             # ike_name = no
 
+            # Optional path to the log file. Overrides the section name. Must be
+            # used if the path contains characters that aren't allowed in
+            # section names.
+            # path =
+
             # Adds the milliseconds within the current second after the
             # timestamp (separated by a dot, so time_format should end with %S
             # or %T).
diff --git a/conf/options/charon-logging.opt b/conf/options/charon-logging.opt
index 2bbb5dce4..e850c4487 100644
--- a/conf/options/charon-logging.opt
+++ b/conf/options/charon-logging.opt
@@ -2,33 +2,38 @@ charon.filelog {}
 	Section to define file loggers, see LOGGER CONFIGURATION in
 	**strongswan.conf**(5).
 
-charon.filelog.<filename> { # }
-	<filename> is the full path to the log file.
+charon.filelog.<name> { # }
+	<name> may be the full path to the log file if it only contains
+	characters permitted in section names. Is ignored if _path_ is specified.
 
-charon.filelog.<filename>.default = 1
+charon.filelog.<name>.path =
+	Optional path to the log file. Overrides the section name. Must be used
+	if the path contains characters that aren't allowed in section names.
+
+charon.filelog.<name>.default = 1
 	Default loglevel.
 
 	Specifies the default loglevel to be used for subsystems for which no
 	specific loglevel is defined.
 
-charon.filelog.<filename>.<subsystem> = <default>
+charon.filelog.<name>.<subsystem> = <default>
 	Loglevel for a specific subsystem.
 
-charon.filelog.<filename>.append = yes
+charon.filelog.<name>.append = yes
 	If this option is enabled log entries are appended to the existing file.
 
-charon.filelog.<filename>.flush_line = no
+charon.filelog.<name>.flush_line = no
 	Enabling this option disables block buffering and enables line buffering.
 
-charon.filelog.<filename>.ike_name = no
+charon.filelog.<name>.ike_name = no
 	Prefix each log entry with the connection name and a unique numerical
 	identifier for each IKE_SA.
 
-charon.filelog.<filename>.time_format
+charon.filelog.<name>.time_format
 	Prefix each log entry with a timestamp. The option accepts a format string
 	as passed to **strftime**(3).
 
-charon.filelog.<filename>.time_add_ms = no
+charon.filelog.<name>.time_add_ms = no
 	Adds the milliseconds within the current second after the timestamp
 	(separated by a dot, so _time_format_ should end with %S or %T).
 
diff --git a/conf/options/charon.conf b/conf/options/charon.conf
index 93dff172d..857ddde9b 100644
--- a/conf/options/charon.conf
+++ b/conf/options/charon.conf
@@ -274,7 +274,7 @@ charon {
         # Buffer size used for crypto benchmark.
         # bench_size = 1024
 
-        # Number of iterations to test each algorithm.
+        # Time in ms during which crypto algorithm performance is measured.
         # bench_time = 50
 
         # Test crypto algorithms during registration (requires test vectors
diff --git a/conf/options/charon.opt b/conf/options/charon.opt
index fcde5f0b5..8fb64bc25 100644
--- a/conf/options/charon.opt
+++ b/conf/options/charon.opt
@@ -52,7 +52,7 @@ charon.crypto_test.bench_size = 1024
 	Buffer size used for crypto benchmark.
 
 charon.crypto_test.bench_time = 50
-	Number of iterations to test each algorithm.
+	Time in ms during which crypto algorithm performance is measured.
 
 charon.crypto_test.on_add = no
 	Test crypto algorithms during registration (requires test vectors provided