Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Resolve the make_...() methods

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2020-02-05 10:14:14 +01:00
parent 5195b79eed
commit 5b02352f1a
13 changed files with 67 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/TTLS/include/Config.h
View File

@@ -1,21 +1,21 @@
/*
Copyright 2015-2020 Amebis
Copyright 2016 GÉANT
Copyright 2016 G<EFBFBD>ANT
This file is part of GÉANTLink.
This file is part of G<EFBFBD>ANTLink.
GÉANTLink is free software: you can redistribute it and/or modify it
G<EFBFBD>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
G<EFBFBD>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/>.
along with G<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
*/
#include <sal.h>
@@ -103,6 +103,7 @@ namespace eap
///
virtual credentials* make_credentials() const;
protected:
///
/// Makes a new inner method config
///
@@ -110,7 +111,7 @@ namespace eap
///
/// \returns A new inner method config of given type
///
virtual config_method* make_config_method(_In_ winstd::eap_type_t eap_type) const = 0;
virtual config_method* make_inner_config(_In_ winstd::eap_type_t eap_type) const = 0;
///
/// Makes a new inner method config
@@ -119,7 +120,7 @@ namespace eap
///
/// \returns A new inner method config of given type
///
virtual config_method* make_config_method(_In_ const wchar_t *eap_type) const = 0;
virtual config_method* make_inner_config(_In_ const wchar_t *eap_type) const = 0;
public:
std::unique_ptr<config_method> m_inner; ///< Inner authentication configuration
@@ -192,23 +193,16 @@ namespace eap
///
virtual const wchar_t* get_method_str() const;
protected:
///
/// Makes a new inner method config
/// @copydoc eap::config_method_tls_tunnel::make_inner_config()
///
/// \param[in] eap_type EAP type
///
/// \returns A new inner method config of given type
///
virtual config_method* make_config_method(_In_ winstd::eap_type_t eap_type) const;
virtual config_method* make_inner_config(_In_ winstd::eap_type_t eap_type) const;
///
/// Makes a new inner method config
/// @copydoc eap::config_method_tls_tunnel::make_inner_config()
///
/// \param[in] eap_type EAP type
///
/// \returns A new inner method config of given type
///
virtual config_method* make_config_method(_In_ const wchar_t *eap_type) const;
virtual config_method* make_inner_config(_In_ const wchar_t *eap_type) const;
};
/// @}

18
lib/TTLS/include/Module.h
View File

@@ -1,21 +1,21 @@
/*
Copyright 2015-2020 Amebis
Copyright 2016 GÉANT
Copyright 2016 G<EFBFBD>ANT
This file is part of GÉANTLink.
This file is part of G<EFBFBD>ANTLink.
GÉANTLink is free software: you can redistribute it and/or modify it
G<EFBFBD>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
G<EFBFBD>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/>.
along with G<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
*/
namespace eap
@@ -78,13 +78,15 @@ namespace eap
peer_ttls();
///
/// @copydoc eap::method::make_config_method()
/// @copydoc eap::method::make_config()
/// \returns This implementation always returns `eap::config_method_ttls` type of configuration
///
virtual config_method* make_config_method();
virtual config_method* make_config();
protected:
/// @copydoc eap::method::make_config_method()
///
/// @copydoc eap::peer_tls_base::make_method()
///
virtual method* make_method(_In_ config_method_tls &cfg, _In_ credentials_tls &cred);
};