UnivNautes

--- src/libcharon/plugins/smp/smp.c.orig	2013-11-01 11:40:35.000000000 +0100

+++ src/libcharon/plugins/smp/smp.c	2014-05-26 22:32:43.000000000 +0200

@@ -15,6 +15,7 @@

 #include <stdlib.h>

+#include <inttypes.h>

 #include "smp.h"

 #include <sys/types.h>

@@ -114,6 +115,146 @@

 }

 /**

+ * Log a configs local or remote authentication config to out

+ */

+static void log_auth_cfgs(xmlTextWriterPtr out, peer_cfg_t *peer_cfg, bool local)

+{

+	enumerator_t *enumerator, *rules;

+	auth_rule_t rule;

+	auth_cfg_t *auth;

+	auth_class_t auth_class;

+	identification_t *id;

+	certificate_t *cert;

+	cert_validation_t valid;

+	char *name;

+

+	name = peer_cfg->get_name(peer_cfg);

+

+	enumerator = peer_cfg->create_auth_cfg_enumerator(peer_cfg, local);

+	while (enumerator->enumerate(enumerator, &auth))

+	{

+		xmlTextWriterStartElement(out, "auth");

+		id = auth->get(auth, AUTH_RULE_IDENTITY);

+		if (id)

+		{

+			write_id(out, "identification", id);

+		}

+

+		auth_class = (uintptr_t)auth->get(auth, AUTH_RULE_AUTH_CLASS);

+		if (auth_class == AUTH_CLASS_EAP)

+		{

+			if ((uintptr_t)auth->get(auth, AUTH_RULE_EAP_TYPE) == EAP_NAK)

+			{

+				xmlTextWriterWriteElement(out, "authtype", "EAP");

+			}

+			else

+			{

+				if ((uintptr_t)auth->get(auth, AUTH_RULE_EAP_VENDOR))

+				{

+					xmlTextWriterStartElement(out, "authtype");

+					xmlTextWriterWriteFormatString(out, "EAP_%" PRIuPTR "-%" PRIuPTR,

+						(uintptr_t)auth->get(auth, AUTH_RULE_EAP_TYPE),

+						(uintptr_t)auth->get(auth, AUTH_RULE_EAP_VENDOR));

+					xmlTextWriterEndElement(out);

+				}

+				else

+				{

+					xmlTextWriterStartElement(out, "authtype");

+					xmlTextWriterWriteFormatString(out, "%N", eap_type_names, (uintptr_t)auth->get(auth, AUTH_RULE_EAP_TYPE));

+					xmlTextWriterEndElement(out);

+				}

+			}

+			id = auth->get(auth, AUTH_RULE_EAP_IDENTITY);

+			if (id)

+			{

+				xmlTextWriterStartElement(out, "identity");

+				xmlTextWriterWriteFormatString(out, "%Y", id);

+				xmlTextWriterEndElement(out);

+			}

+		}

+		else if (auth_class == AUTH_CLASS_XAUTH)

+		{

+			xmlTextWriterStartElement(out, "authtype");

+			xmlTextWriterWriteFormatString(out, "%N: %s", auth_class_names, auth_class,

+					auth->get(auth, AUTH_RULE_XAUTH_BACKEND) ?: "any");

+			xmlTextWriterEndElement(out);

+			id = auth->get(auth, AUTH_RULE_XAUTH_IDENTITY);

+			if (id)

+			{

+				xmlTextWriterStartElement(out, "identity");

+				xmlTextWriterWriteFormatString(out, "%Y", id);

+				xmlTextWriterEndElement(out);

+			}

+		}

+		else

+		{

+			xmlTextWriterStartElement(out, "authtype");

+			xmlTextWriterWriteFormatString(out, "%N", auth_class_names, auth_class);

+			xmlTextWriterEndElement(out);

+		}

+

+		xmlTextWriterStartElement(out, "ca_cert");

+		cert = auth->get(auth, AUTH_RULE_CA_CERT);

+		if (cert)

+		{

+			xmlTextWriterWriteFormatString(out, "%Y", cert->get_subject(cert));

+		}

+		xmlTextWriterEndElement(out);

+

+		xmlTextWriterStartElement(out, "im_cert");

+		cert = auth->get(auth, AUTH_RULE_IM_CERT);

+		if (cert)

+		{

+			xmlTextWriterWriteFormatString(out, "%Y", cert->get_subject(cert));

+		}

+		xmlTextWriterEndElement(out);

+

+		xmlTextWriterStartElement(out, "subject_cert");

+		cert = auth->get(auth, AUTH_RULE_SUBJECT_CERT);

+		if (cert)

+		{

+			xmlTextWriterWriteFormatString(out, "%Y", cert->get_subject(cert));

+		}

+		xmlTextWriterEndElement(out);

+

+		xmlTextWriterStartElement(out, "ocsp_validation");

+		valid = (uintptr_t)auth->get(auth, AUTH_RULE_OCSP_VALIDATION);

+		if (valid != VALIDATION_FAILED)

+		{

+			xmlTextWriterWriteFormatString(out, "%s",

+					(valid == VALIDATION_SKIPPED) ? "SKIPPED" : "GOOD");

+					

+		}

+		xmlTextWriterEndElement(out);

+

+		xmlTextWriterStartElement(out, "crl_validation");

+		valid = (uintptr_t)auth->get(auth, AUTH_RULE_CRL_VALIDATION);

+		if (valid != VALIDATION_FAILED)

+		{

+			xmlTextWriterWriteFormatString(out, "%s",

+					(valid == VALIDATION_SKIPPED) ? "SKIPPED" : "GOOD");

+		}

+		xmlTextWriterEndElement(out);

+

+		xmlTextWriterStartElement(out, "groups");

+		rules = auth->create_enumerator(auth);

+		while (rules->enumerate(rules, &rule, &id))

+		{

+			if (rule == AUTH_RULE_GROUP)

+			{

+				xmlTextWriterStartElement(out, "group");

+				xmlTextWriterWriteFormatString(out, "%Y", id);

+				xmlTextWriterEndElement(out);

+			}

+		}

+		xmlTextWriterEndElement(out);

+		xmlTextWriterEndElement(out);

+		rules->destroy(rules);

+	}

+	enumerator->destroy(enumerator);

+}

+

+/**

  * write a host_t address into an element

  */

 static void write_address(xmlTextWriterPtr writer, char *element, host_t *host)

@@ -228,6 +369,7 @@

 		/* <local> */

 		local = ike_sa->get_my_host(ike_sa);

 		xmlTextWriterStartElement(writer, "local");

+		log_auth_cfgs(writer, ike_sa->get_peer_cfg(ike_sa), TRUE);

 		xmlTextWriterWriteFormatElement(writer, "spi", "%.16llx",

 							id->is_initiator(id) ? id->get_initiator_spi(id)

 												 : id->get_responder_spi(id));

@@ -245,6 +387,7 @@

 		/* <remote> */

 		remote = ike_sa->get_other_host(ike_sa);

 		xmlTextWriterStartElement(writer, "remote");

+		log_auth_cfgs(writer, ike_sa->get_peer_cfg(ike_sa), FALSE);

 		xmlTextWriterWriteFormatElement(writer, "spi", "%.16llx",

 							id->is_initiator(id) ? id->get_responder_spi(id)

 												 : id->get_initiator_spi(id));

@@ -737,7 +880,7 @@