From 391fc796d738e154437a07e1f8d55fa00d7dd3bf Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 31 Jan 2017 14:00:37 +0100
Subject: [PATCH] Clean-up

---
 lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h | 12 ++++++------
 lib/PAP_UI/include/PAP_UI.h           | 12 ++++++------
 lib/TTLS/src/Config.cpp               |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h b/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h
index 3ecc78f..6dcce15 100644
--- a/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h
+++ b/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h
@@ -21,21 +21,21 @@
 #include "../../EAPBase_UI/include/EAP_UI.h"
 #include "../../MSCHAPv2/include/Config.h"
 
+///
+/// MSCHAPv2 credential entry panel
+///
+typedef wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> wxMSCHAPv2CredentialsPanel;
+
 ///
 /// MSCHAPv2 credential configuration panel
 ///
-typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> > wxMSCHAPv2CredentialsConfigPanel;
+typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxMSCHAPv2CredentialsPanel> wxMSCHAPv2CredentialsConfigPanel;
 
 ///
 /// MSCHAPv2 configuration panel
 ///
 class wxMSCHAPv2ConfigPanel;
 
-///
-/// MSCHAPv2 credential entry panel
-///
-typedef wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> wxMSCHAPv2CredentialsPanel;
-
 #pragma once
 
 #include <wx/panel.h>
diff --git a/lib/PAP_UI/include/PAP_UI.h b/lib/PAP_UI/include/PAP_UI.h
index da2acf5..fc3b431 100644
--- a/lib/PAP_UI/include/PAP_UI.h
+++ b/lib/PAP_UI/include/PAP_UI.h
@@ -21,21 +21,21 @@
 #include "../../EAPBase_UI/include/EAP_UI.h"
 #include "../../PAP/include/Config.h"
 
+///
+/// PAP credential entry panel
+///
+typedef wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> wxPAPCredentialsPanel;
+
 ///
 /// PAP credential configuration panel
 ///
-typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> > wxPAPCredentialsConfigPanel;
+typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxPAPCredentialsPanel> wxPAPCredentialsConfigPanel;
 
 ///
 /// PAP configuration panel
 ///
 class wxPAPConfigPanel;
 
-///
-/// PAP credential entry panel
-///
-typedef wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> wxPAPCredentialsPanel;
-
 #pragma once
 
 #include <wx/panel.h>
diff --git a/lib/TTLS/src/Config.cpp b/lib/TTLS/src/Config.cpp
index b7c4a50..7397307 100644
--- a/lib/TTLS/src/Config.cpp
+++ b/lib/TTLS/src/Config.cpp
@@ -114,7 +114,7 @@ void eap::config_method_ttls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode
             throw com_runtime_error(hr, __FUNCTION__ " Error creating <NonEAPAuthMethod> element.");
     } else {
         // <InnerAuthenticationMethod>/<EAPMethod>
-        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElInnerAuthenticationMethod, bstr(L"EAPMethod"), namespace_eapmetadata, (DWORD)m_inner->get_method_id())))
+        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElInnerAuthenticationMethod, bstr(L"EAPMethod"), namespace_eapmetadata, (DWORD)eap_type)))
             throw com_runtime_error(hr, __FUNCTION__ " Error creating <EAPMethod> element.");
     }