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

method_ttls is now descendant of method_tls

Browse Source
This commit is contained in:
Simon Rozman
2016-08-13 08:48:24 +02:00
parent 1306c958fc
commit 3d54c84430
2 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/TTLS/include/Method.h
View File

@@ -37,7 +37,7 @@ namespace eap
namespace eap namespace eap
{ {
class method_ttls : public method class method_ttls : public method_tls
{ {
public: public:
/// ///
@@ -96,16 +96,16 @@ namespace eap
/// \name Packet processing /// \name Packet processing
/// @{ /// @{
/// /////
/// Starts an EAP authentication session on the peer EAPHost using the EAP method. ///// Starts an EAP authentication session on the peer EAPHost using the EAP method.
/// /////
/// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx) ///// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
/// /////
virtual void begin_session( //virtual void begin_session(
_In_ DWORD dwFlags, // _In_ DWORD dwFlags,
_In_ const EapAttributes *pAttributeArray, // _In_ const EapAttributes *pAttributeArray,
_In_ HANDLE hTokenImpersonateUser, // _In_ HANDLE hTokenImpersonateUser,
_In_ DWORD dwMaxSendPacketSize); // _In_ DWORD dwMaxSendPacketSize);
/// ///
/// Processes a packet received by EAPHost from a supplicant. /// Processes a packet received by EAPHost from a supplicant.
@@ -126,19 +126,18 @@ namespace eap
_Inout_bytecap_(*dwSendPacketSize) EapPacket *pSendPacket, _Inout_bytecap_(*dwSendPacketSize) EapPacket *pSendPacket,
_Inout_ DWORD *pdwSendPacketSize); _Inout_ DWORD *pdwSendPacketSize);
/// /////
/// Obtains the result of an authentication session from the EAP method. ///// Obtains the result of an authentication session from the EAP method.
/// /////
/// \sa [EapPeerGetResult function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363611.aspx) ///// \sa [EapPeerGetResult function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363611.aspx)
/// /////
virtual void get_result( //virtual void get_result(
_In_ EapPeerMethodResultReason reason, // _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult); // _Inout_ EapPeerMethodResult *ppResult);
/// @} /// @}
public: public:
method_tls m_outer; ///< EAP-TLS method
enum version_t { enum version_t {
version_0 = 0, ///< EAP-TTLS v0 version_0 = 0, ///< EAP-TTLS v0
} m_version; ///< EAP-TTLS version } m_version; ///< EAP-TTLS version

52
lib/TTLS/src/Method.cpp
View File

@@ -29,22 +29,22 @@ using namespace winstd;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
eap::method_ttls::method_ttls(_In_ module &module, _In_ config_method_ttls &cfg, _In_ credentials_ttls &cred) : eap::method_ttls::method_ttls(_In_ module &module, _In_ config_method_ttls &cfg, _In_ credentials_ttls &cred) :
m_outer(module, cfg.m_outer, cred.m_outer), m_version(version_0),
method(module, cfg, cred) method_tls(module, cfg, cred)
{ {
} }
eap::method_ttls::method_ttls(_In_ const method_ttls &other) : eap::method_ttls::method_ttls(_In_ const method_ttls &other) :
m_outer(other.m_outer), m_version(other.m_version),
method(other) method_tls(other)
{ {
} }
eap::method_ttls::method_ttls(_Inout_ method_ttls &&other) : eap::method_ttls::method_ttls(_Inout_ method_ttls &&other) :
m_outer(std::move(other.m_outer)), m_version(std::move(other.m_version)),
method(std::move(other)) method_tls(std::move(other))
{ {
} }
@@ -52,8 +52,8 @@ eap::method_ttls::method_ttls(_Inout_ method_ttls &&other) :
eap::method_ttls& eap::method_ttls::operator=(_In_ const method_ttls &other) eap::method_ttls& eap::method_ttls::operator=(_In_ const method_ttls &other)
{ {
if (this != std::addressof(other)) { if (this != std::addressof(other)) {
(method&)*this = other; (method_tls&)*this = other;
m_outer = other.m_outer; m_version = other.m_version;
} }
return *this; return *this;
@@ -63,22 +63,22 @@ eap::method_ttls& eap::method_ttls::operator=(_In_ const method_ttls &other)
eap::method_ttls& eap::method_ttls::operator=(_Inout_ method_ttls &&other) eap::method_ttls& eap::method_ttls::operator=(_Inout_ method_ttls &&other)
{ {
if (this != std::addressof(other)) { if (this != std::addressof(other)) {
(method&)*this = std::move(other); (method_tls&)*this = std::move(other);
m_outer = std::move(other.m_outer); m_version = std::move(other.m_version);
} }
return *this; return *this;
} }
void eap::method_ttls::begin_session( //void eap::method_ttls::begin_session(
_In_ DWORD dwFlags, // _In_ DWORD dwFlags,
_In_ const EapAttributes *pAttributeArray, // _In_ const EapAttributes *pAttributeArray,
_In_ HANDLE hTokenImpersonateUser, // _In_ HANDLE hTokenImpersonateUser,
_In_ DWORD dwMaxSendPacketSize) // _In_ DWORD dwMaxSendPacketSize)
{ //{
m_outer.begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize); // m_outer.begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
} //}
void eap::method_ttls::process_request_packet( void eap::method_ttls::process_request_packet(
@@ -95,7 +95,7 @@ void eap::method_ttls::process_request_packet(
m_module.log_event(&EAPMETHOD_TTLS_HANDSHAKE_START, event_data((unsigned int)eap_type_ttls), event_data((unsigned char)m_version), event_data((unsigned char)ver_remote), event_data::blank); m_module.log_event(&EAPMETHOD_TTLS_HANDSHAKE_START, event_data((unsigned int)eap_type_ttls), event_data((unsigned char)m_version), event_data((unsigned char)ver_remote), event_data::blank);
} }
m_outer.process_request_packet(pReceivedPacket, dwReceivedPacketSize, pEapOutput); method_tls::process_request_packet(pReceivedPacket, dwReceivedPacketSize, pEapOutput);
} }
@@ -103,7 +103,7 @@ void eap::method_ttls::get_response_packet(
_Inout_bytecap_(*dwSendPacketSize) EapPacket *pSendPacket, _Inout_bytecap_(*dwSendPacketSize) EapPacket *pSendPacket,
_Inout_ DWORD *pdwSendPacketSize) _Inout_ DWORD *pdwSendPacketSize)
{ {
m_outer.get_response_packet(pSendPacket, pdwSendPacketSize); method_tls::get_response_packet(pSendPacket, pdwSendPacketSize);
// Change packet type to EAP-TTLS, and add EAP-TTLS version. // Change packet type to EAP-TTLS, and add EAP-TTLS version.
pSendPacket->Data[0] = (BYTE)eap_type_ttls; pSendPacket->Data[0] = (BYTE)eap_type_ttls;
@@ -112,9 +112,9 @@ void eap::method_ttls::get_response_packet(
} }
void eap::method_ttls::get_result( //void eap::method_ttls::get_result(
_In_ EapPeerMethodResultReason reason, // _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult) // _Inout_ EapPeerMethodResult *ppResult)
{ //{
m_outer.get_result(reason, ppResult); // m_outer.get_result(reason, ppResult);
} //}