From d508a6c3982033f0314f13a2b8837d01887356b4 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 31 Jan 2017 13:54:55 +0100
Subject: [PATCH] EAP-GTC implementation continues...

---
 lib/GTC/include/Config.h    |  2 +-
 lib/GTC/include/Method.h    |  4 ++--
 lib/GTC/src/Config.cpp      |  4 ++--
 lib/GTC/src/Method.cpp      |  2 +-
 lib/GTC_UI/include/GTC_UI.h | 12 ++++++------
 lib/TTLS/src/Module.cpp     |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/GTC/include/Config.h b/lib/GTC/include/Config.h
index faf834b..54c819d 100644
--- a/lib/GTC/include/Config.h
+++ b/lib/GTC/include/Config.h
@@ -101,7 +101,7 @@ namespace eap
 
         ///
         /// @copydoc eap::config_method::make_credentials()
-        /// \returns This implementation always returns `eap::credentials` type of credentials
+        /// \returns This implementation always returns `eap::credentials_identity` type of credentials
         ///
         virtual credentials* make_credentials() const;
     };
diff --git a/lib/GTC/include/Method.h b/lib/GTC/include/Method.h
index c665634..d38b90b 100644
--- a/lib/GTC/include/Method.h
+++ b/lib/GTC/include/Method.h
@@ -50,7 +50,7 @@ namespace eap
         /// \param[in] cfg   Method configuration
         /// \param[in] cred  User credentials
         ///
-        method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred);
+        method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials_identity &cred);
 
         ///
         /// Moves a GTC method
@@ -111,7 +111,7 @@ namespace eap
 
     protected:
         config_method_eapgtc &m_cfg;            ///< Method configuration
-        credentials &m_cred;                    ///< Method user credentials
+        credentials_identity &m_cred;           ///< Method user credentials
         winstd::sanitizing_wstring m_message;   ///< Authenticator message
         winstd::sanitizing_wstring m_reply;     ///< GTC reply
     };
diff --git a/lib/GTC/src/Config.cpp b/lib/GTC/src/Config.cpp
index dff87c3..96c445e 100644
--- a/lib/GTC/src/Config.cpp
+++ b/lib/GTC/src/Config.cpp
@@ -30,7 +30,7 @@ using namespace winstd;
 
 eap::config_method_eapgtc::config_method_eapgtc(_In_ module &mod, _In_ unsigned int level) : config_method_with_cred(mod, level)
 {
-    m_cred.reset(new credentials(mod));
+    m_cred.reset(new credentials_identity(mod));
 }
 
 
@@ -84,5 +84,5 @@ const wchar_t* eap::config_method_eapgtc::get_method_str() const
 
 eap::credentials* eap::config_method_eapgtc::make_credentials() const
 {
-    return new eap::credentials(m_module);
+    return new eap::credentials_identity(m_module);
 }
diff --git a/lib/GTC/src/Method.cpp b/lib/GTC/src/Method.cpp
index 598acd2..c6d3a21 100644
--- a/lib/GTC/src/Method.cpp
+++ b/lib/GTC/src/Method.cpp
@@ -28,7 +28,7 @@ using namespace winstd;
 // eap::method_gtc
 //////////////////////////////////////////////////////////////////////
 
-eap::method_gtc::method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred) :
+eap::method_gtc::method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials_identity &cred) :
     m_cfg(cfg),
     m_cred(cred),
     method(mod)
diff --git a/lib/GTC_UI/include/GTC_UI.h b/lib/GTC_UI/include/GTC_UI.h
index b869152..b97d67a 100644
--- a/lib/GTC_UI/include/GTC_UI.h
+++ b/lib/GTC_UI/include/GTC_UI.h
@@ -26,15 +26,15 @@ class wxGTCConfigPanel;
 /// \addtogroup EAPBaseGUI
 /// @{
 
-///
-/// GTC credential configuration panel
-///
-typedef wxEAPCredentialsConfigPanel<eap::credentials, wxIdentityCredentialsPanel<eap::credentials, wxIdentityCredentialsPanelBase> > wxGTCCredentialsConfigPanel;
-
 ///
 /// GTC credential entry panel
 ///
-typedef wxIdentityCredentialsPanel<eap::credentials, wxIdentityCredentialsPanelBase> wxGTCCredentialsPanel;
+typedef wxIdentityCredentialsPanel<eap::credentials_identity, wxIdentityCredentialsPanelBase> wxGTCCredentialsPanel;
+
+///
+/// GTC credential configuration panel
+///
+typedef wxEAPCredentialsConfigPanel<eap::credentials_identity, wxGTCCredentialsPanel> wxGTCCredentialsConfigPanel;
 
 /// @}
 
diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp
index 7b372e0..158f8b6 100644
--- a/lib/TTLS/src/Module.cpp
+++ b/lib/TTLS/src/Module.cpp
@@ -255,7 +255,7 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session(
         case eap_type_gtc            : meth_inner.reset(
                                            new method_eapmsg  (*this, cred_inner->get_identity().c_str(),
                                            new method_eap     (*this, eap_type_gtc,
-                                           new method_gtc     (*this, dynamic_cast<config_method_eapgtc&>(*cfg_inner), dynamic_cast<credentials_pass&>(*cred_inner))))); break;
+                                           new method_gtc     (*this, dynamic_cast<config_method_eapgtc&>(*cfg_inner), dynamic_cast<credentials_identity&>(*cred_inner))))); break;
         default: throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method.");
         }
     }