Credentials are no longer stored using method name (TLS/PAP/MSCHAPv2) but with level/type identifier

lib/PAP/src/Config.cpp

@@ -28,9 +28,9 @@ using namespace winstd;
 // eap::config_method_pap
 //////////////////////////////////////////////////////////////////////
 
-eap::config_method_pap::config_method_pap(_In_ module &mod) : config_method_with_cred(mod)
+eap::config_method_pap::config_method_pap(_In_ module &mod, _In_ unsigned int level) : config_method_with_cred(mod, level)
 {
-    m_preshared.reset(new credentials_pap(mod));
+    m_preshared.reset(new credentials_pass(mod));
 }
 
 
@@ -84,5 +84,5 @@ const wchar_t* eap::config_method_pap::get_method_str() const
 
 eap::credentials* eap::config_method_pap::make_credentials() const
 {
-    return new credentials_pap(m_module);
+    return new credentials_pass(m_module);
 }

lib/PAP/src/Credentials.cpp

@@ -1,112 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::credentials_pap
-//////////////////////////////////////////////////////////////////////
-
-eap::credentials_pap::credentials_pap(_In_ module &mod) : credentials_pass(mod)
-{
-}
-
-
-eap::credentials_pap::credentials_pap(_In_ const credentials_pap &other) :
-    credentials_pass(other)
-{
-}
-
-
-eap::credentials_pap::credentials_pap(_Inout_ credentials_pap &&other) :
-    credentials_pass(std::move(other))
-{
-}
-
-
-eap::credentials_pap& eap::credentials_pap::operator=(_In_ const credentials_pap &other)
-{
-    if (this != &other)
-        (credentials_pass&)*this = other;
-
-    return *this;
-}
-
-
-eap::credentials_pap& eap::credentials_pap::operator=(_Inout_ credentials_pap &&other)
-{
-    if (this != &other)
-        (credentials_pass&&)*this = std::move(other);
-
-    return *this;
-}
-
-
-eap::config* eap::credentials_pap::clone() const
-{
-    return new credentials_pap(*this);
-}
-
-
-LPCTSTR eap::credentials_pap::target_suffix() const
-{
-    return _T("PAP");
-}
-
-
-eap::credentials::source_t eap::credentials_pap::combine(
-    _In_       const credentials             *cred_cached,
-    _In_       const config_method_with_cred &cfg,
-    _In_opt_z_       LPCTSTR                 pszTargetName)
-{
-    if (cred_cached) {
-        // Using EAP service cached credentials.
-        *this = *(credentials_pap*)cred_cached;
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED1, event_data((unsigned int)eap_type_legacy_pap), event_data(credentials_pap::get_name()), event_data::blank);
-        return source_cache;
-    }
-
-    if (cfg.m_use_preshared) {
-        // Using preshared credentials.
-        *this = *(credentials_pap*)cfg.m_preshared.get();
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_PRESHARED1, event_data((unsigned int)eap_type_legacy_pap), event_data(credentials_pap::get_name()), event_data::blank);
-        return source_preshared;
-    }
-
-    if (pszTargetName) {
-        try {
-            credentials_pap cred_loaded(m_module);
-            cred_loaded.retrieve(pszTargetName);
-
-            // Using stored credentials.
-            *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED1, event_data((unsigned int)eap_type_legacy_pap), event_data(credentials_pap::get_name()), event_data::blank);
-            return source_storage;
-        } catch (...) {
-            // Not actually an error.
-        }
-    }
-
-    return source_unknown;
-}

lib/PAP/src/Method.cpp

@@ -28,7 +28,7 @@ using namespace winstd;
 // eap::method_pap
 //////////////////////////////////////////////////////////////////////
 
-eap::method_pap::method_pap(_In_ module &module, _In_ config_method_pap &cfg, _In_ credentials_pap &cred) :
+eap::method_pap::method_pap(_In_ module &module, _In_ config_method_pap &cfg, _In_ credentials_pass &cred) :
     m_cred(cred),
     m_phase(phase_unknown),
     method_noneap(module, cfg, cred)

lib/PAP/src/StdAfx.h

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "../include/Config.h"
-#include "../include/Credentials.h"
 #include "../include/Method.h"
 
 #include <Windows.h>