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

eap namespace clean-up

Browse Source
This commit is contained in:
Simon Rozman
2016-08-08 10:13:34 +02:00
parent bf4b7f9787
commit 8f4c177d49
4 changed files with 236 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,13 +20,6 @@
namespace eap
{
///
/// EAP-TTLS packet flags
///
/// \sa [Extensible Authentication Protocol Tunneled Transport Layer Security Authenticated Protocol Version 0 (EAP-TTLSv0) (Chapter: 9.1 Packet Format)](https://tools.ietf.org/html/rfc5281#section-9.1)
///
enum ttls_flags_t;
///
/// EAP-TTLS method
///
@@ -44,16 +37,21 @@ namespace eap
namespace eap
{
enum ttls_flags_t {
ttls_flags_length_incl = tls_req_flags_length_incl, ///< Length included
ttls_flags_more_frag = tls_req_flags_more_frag, ///< More fragments
ttls_flags_start = tls_req_flags_start, ///< Start
ttls_flags_ver_mask = 0x07, ///< Version mask
};
class method_ttls : public method
{
public:
///
/// EAP-TTLS packet flags
///
/// \sa [Extensible Authentication Protocol Tunneled Transport Layer Security Authenticated Protocol Version 0 (EAP-TTLSv0) (Chapter: 9.1 Packet Format)](https://tools.ietf.org/html/rfc5281#section-9.1)
///
enum flags_t {
flags_length_incl = method_tls::flags_req_length_incl, ///< Length included
flags_more_frag = method_tls::flags_req_more_frag, ///< More fragments
flags_start = method_tls::flags_req_start, ///< Start
flags_ver_mask = 0x07, ///< Version mask
};
public:
///
/// Constructs an EAP method

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

@@ -100,11 +100,11 @@ bool eap::method_ttls::process_request_packet(
return false;
}
if (pReceivedPacket->Code == EapCodeRequest && (pReceivedPacket->Data[1] & ttls_flags_start)) {
if (pReceivedPacket->Code == EapCodeRequest && (pReceivedPacket->Data[1] & flags_start)) {
// This is a start EAP-TTLS packet.
// Determine minimum EAP-TTLS version supported by server and us.
version_t ver_remote = (version_t)(pReceivedPacket->Data[1] & ttls_flags_ver_mask);
version_t ver_remote = (version_t)(pReceivedPacket->Data[1] & flags_ver_mask);
m_version = std::min<version_t>(ver_remote, version_0);
m_module.log_event(&EAPMETHOD_HANDSHAKE_START1, event_data((unsigned int)eap_type_ttls), event_data((unsigned char)m_version), event_data((unsigned char)ver_remote), event_data::blank);
}
@@ -123,7 +123,7 @@ bool eap::method_ttls::get_response_packet(
// Change packet type to EAP-TTLS, and add EAP-TTLS version.
pSendPacket->Data[0] = (BYTE)eap_type_ttls;
pSendPacket->Data[1] &= ~ttls_flags_ver_mask;
pSendPacket->Data[1] &= ~flags_ver_mask;
pSendPacket->Data[1] |= m_version;
return true;