From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 16 Dec 2011 15:27:28 +0000 (+0100)
Subject: Added ASN debug group to log low-level encoding/decoding (ASN.1, X.509).
X-Git-Tag: 4.6.2~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54d096a712965007e09cee70e9a812f89a16da69;p=thirdparty%2Fstrongswan.git

Added ASN debug group to log low-level encoding/decoding (ASN.1, X.509).

This will allow us to remove quite some clutter from the LIB debug group
for higher debug levels.
---

diff --git a/man/ipsec.conf.5.in b/man/ipsec.conf.5.in
index fc017613be..2b0d64e0be 100644
--- a/man/ipsec.conf.5.in
+++ b/man/ipsec.conf.5.in
@@ -1315,7 +1315,7 @@ A comma separated list containing type/level-pairs may
 be specified, e.g:
 .B dmn 3, ike 1, net -1.
 Acceptable values for types are
-.B dmn, mgr, ike, chd, job, cfg, knl, net, enc, lib, tls, tnc, imc, imv, pts
+.B dmn, mgr, ike, chd, job, cfg, knl, net, asn, enc, lib, tls, tnc, imc, imv, pts
 and the level is one of
 .B -1, 0, 1, 2, 3, 4
 (for silent, audit, control, controlmore, raw, private).  By default, the level
diff --git a/man/strongswan.conf.5.in b/man/strongswan.conf.5.in
index 177730a335..d48b9021ac 100644
--- a/man/strongswan.conf.5.in
+++ b/man/strongswan.conf.5.in
@@ -833,6 +833,9 @@ IPsec/Networking kernel interface
 .B net
 IKE network communication
 .TP
+.B asn
+Low-level encoding/decoding (ASN.1, X.509 etc.)
+.TP
 .B enc
 Packet encoding/decoding encryption/decryption operations
 .TP
diff --git a/src/charon/charon.c b/src/charon/charon.c
index 141403b895..7a269d7f07 100644
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -426,7 +426,7 @@ static void usage(const char *msg)
 					"         [--version]\n"
 					"         [--use-syslog]\n"
 					"         [--debug-<type> <level>]\n"
-					"           <type>:  log context type (dmn|mgr|ike|chd|job|cfg|knl|net|enc|tnc|imc|imv|pts|tls|lib)\n"
+					"           <type>:  log context type (dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|lib)\n"
 					"           <level>: log verbosity (-1 = silent, 0 = audit, 1 = control,\n"
 					"                                    2 = controlmore, 3 = raw, 4 = private)\n"
 					"\n"
@@ -497,6 +497,7 @@ int main(int argc, char *argv[])
 			{ "debug-cfg", required_argument, &group, DBG_CFG },
 			{ "debug-knl", required_argument, &group, DBG_KNL },
 			{ "debug-net", required_argument, &group, DBG_NET },
+			{ "debug-asn", required_argument, &group, DBG_ASN },
 			{ "debug-enc", required_argument, &group, DBG_ENC },
 			{ "debug-tnc", required_argument, &group, DBG_TNC },
 			{ "debug-imc", required_argument, &group, DBG_IMC },
diff --git a/src/libstrongswan/debug.c b/src/libstrongswan/debug.c
index 6083034457..d6c5b06b6c 100644
--- a/src/libstrongswan/debug.c
+++ b/src/libstrongswan/debug.c
@@ -26,6 +26,7 @@ ENUM(debug_names, DBG_DMN, DBG_LIB,
 	"CFG",
 	"KNL",
 	"NET",
+	"ASN",
 	"ENC",
 	"TNC",
 	"IMC",
@@ -44,6 +45,7 @@ ENUM(debug_lower_names, DBG_DMN, DBG_LIB,
 	"cfg",
 	"knl",
 	"net",
+	"asn",
 	"enc",
 	"tnc",
 	"imc",
diff --git a/src/libstrongswan/debug.h b/src/libstrongswan/debug.h
index 849d28f9f1..2a6ff98add 100644
--- a/src/libstrongswan/debug.h
+++ b/src/libstrongswan/debug.h
@@ -48,6 +48,8 @@ enum debug_t {
 	DBG_KNL,
 	/** networking/sockets */
 	DBG_NET,
+	/** low-level encoding/decoding (ASN.1, X.509 etc.) */
+	DBG_ASN,
 	/** message encoding/decoding */
 	DBG_ENC,
 	/** trusted network connect */
diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c
index a27c374c74..d4e0447152 100644
--- a/src/stroke/stroke.c
+++ b/src/stroke/stroke.c
@@ -393,7 +393,7 @@ static void exit_usage(char *error)
 	printf("    where: START and optional END define the clients source IP\n");
 	printf("  Set loglevel for a logging type:\n");
 	printf("    stroke loglevel TYPE LEVEL\n");
-	printf("    where: TYPE is any|dmn|mgr|ike|chd|job|cfg|knl|net|enc|tnc|imc|imv|pts|tls|lib\n");
+	printf("    where: TYPE is any|dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|lib\n");
 	printf("           LEVEL is -1|0|1|2|3|4\n");
 	printf("  Show connection status:\n");
 	printf("    stroke status\n");