display EAP identifiers in HEX format

diff --git a/src/libcharon/plugins/eap_peap/eap_peap_peer.c b/src/libcharon/plugins/eap_peap/eap_peap_peer.c
index a4a92c78e5985166d68bc6d9d2dcfbb16e98c5df..6b6c2a9de6b72fc4abbbc997939b1ce2c7e828e0 100644 (file)
--- a/src/libcharon/plugins/eap_peap/eap_peap_peer.c
+++ b/src/libcharon/plugins/eap_peap/eap_peap_peer.c
@@ -130,12 +130,12 @@ METHOD(tls_application_t, process, status_t,
                if (received_vendor)
                {
                        DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d "
-                                                 "(id: %u)", received_type, received_vendor,
+                                                 "(id 0x%02X", received_type, received_vendor,
                                                   in->get_identifier(in));
                }
                else
                {
-                       DBG1(DBG_IKE, "server requested %N authentication (id: %u)",
+                       DBG1(DBG_IKE, "server requested %N authentication (id 0x%02X)",
                                 eap_type_names, received_type, in->get_identifier(in));
                }
                this->ph2_method = charon->eap->create_instance(charon->eap,

diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
index 0ee6beaf9d4c4a6b8bd47802cb1996ba87db3c4c..f7f676dc81c242a0e68e0e9b4d01a9c69973d89c 100644 (file)
--- a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
+++ b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
@@ -168,12 +168,12 @@ METHOD(tls_application_t, process, status_t,
                if (received_vendor)
                {
                        DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d "
-                                                 "(id: %u)", received_type, received_vendor,
+                                                 "(id 0x%02X)", received_type, received_vendor,
                                                   in->get_identifier(in));
                }
                else
                {
-                       DBG1(DBG_IKE, "server requested %N authentication (id: %u)",
+                       DBG1(DBG_IKE, "server requested %N authentication (id 0x%02X)",
                                 eap_type_names, received_type, in->get_identifier(in));
                }
                this->method = charon->eap->create_instance(charon->eap,

diff --git a/src/libcharon/sa/authenticators/eap_authenticator.c b/src/libcharon/sa/authenticators/eap_authenticator.c
index c39fe05175770a590dc82369752efce03ac5c87b..6cae0034b5efb4ad6b365472737379d86f046d91 100644 (file)
--- a/src/libcharon/sa/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/authenticators/eap_authenticator.c
@@ -187,12 +187,12 @@ static eap_payload_t* server_initiate_eap(private_eap_authenticator_t *this,
                {
                        if (vendor)
                        {
-                               DBG1(DBG_IKE, "initiating EAP vendor type %d-%d method (id: %u)",
+                               DBG1(DBG_IKE, "initiating EAP vendor type %d-%d method (id 0x%02X)",
                                         type, vendor, out->get_identifier(out));
                        }
                        else
                        {
-                               DBG1(DBG_IKE, "initiating %N method (id: %u)", eap_type_names,
+                               DBG1(DBG_IKE, "initiating %N method (id 0x%02X)", eap_type_names,
                                         type, out->get_identifier(out));
                        }
                        return out;
@@ -373,11 +373,11 @@ static eap_payload_t* client_process_eap(private_eap_authenticator_t *this,
                if (vendor)
                {
                        DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d ",
-                                                 "(id: %u)", type, vendor, in->get_identifier(in));
+                                                 "(id 0x%02X)", type, vendor, in->get_identifier(in));
                }
                else
                {
-                       DBG1(DBG_IKE, "server requested %N authentication (id: %u)",
+                       DBG1(DBG_IKE, "server requested %N authentication (id 0x%02X)",
                                 eap_type_names, type, in->get_identifier(in));
                }
                this->method = load_method(this, type, vendor, EAP_PEER);