Various ownTLS leftover clean-up
This commit is contained in:
@@ -83,7 +83,6 @@
|
||||
<ClInclude Include="..\include\Credentials.h" />
|
||||
<ClInclude Include="..\include\Method.h" />
|
||||
<ClInclude Include="..\include\Module.h" />
|
||||
<ClInclude Include="..\include\TTLS.h" />
|
||||
<ClInclude Include="..\src\StdAfx.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@@ -26,9 +26,6 @@
|
||||
<ClInclude Include="..\include\Module.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\TTLS.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\StdAfx.cpp">
|
||||
|
@@ -40,7 +40,6 @@ namespace eap
|
||||
|
||||
#include "Config.h"
|
||||
#include "Credentials.h"
|
||||
#include "TTLS.h"
|
||||
|
||||
#include "../../EAPBase/include/Method.h"
|
||||
|
||||
|
@@ -1,52 +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/>.
|
||||
*/
|
||||
|
||||
namespace eap
|
||||
{
|
||||
///
|
||||
/// EAP-TTLS packet
|
||||
///
|
||||
class packet_ttls;
|
||||
}
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "../../TLS/include/TLS.h"
|
||||
|
||||
|
||||
namespace eap
|
||||
{
|
||||
class packet_ttls : public packet_tls
|
||||
{
|
||||
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)
|
||||
///
|
||||
#pragma warning(suppress: 4480)
|
||||
enum flags_t : unsigned char {
|
||||
flags_length_incl = packet_tls::flags_req_length_incl, ///< Length included
|
||||
flags_more_frag = packet_tls::flags_req_more_frag, ///< More fragments
|
||||
flags_start = packet_tls::flags_req_start, ///< Start
|
||||
flags_ver_mask = 0x07, ///< Version mask
|
||||
};
|
||||
};
|
||||
}
|
@@ -781,14 +781,14 @@ void eap::method_ttls::get_result(
|
||||
const unsigned char *_key_block = key_block.rgbKeys;
|
||||
|
||||
// MSK: MPPE-Recv-Key
|
||||
a.create_ms_mppe_key(16, _key_block, sizeof(tls_random));
|
||||
a.create_ms_mppe_key(16, _key_block, 32);
|
||||
m_eap_attr.push_back(std::move(a));
|
||||
_key_block += sizeof(tls_random);
|
||||
_key_block += 32;
|
||||
|
||||
// MSK: MPPE-Send-Key
|
||||
a.create_ms_mppe_key(17, _key_block, sizeof(tls_random));
|
||||
a.create_ms_mppe_key(17, _key_block, 32);
|
||||
m_eap_attr.push_back(std::move(a));
|
||||
_key_block += sizeof(tls_random);
|
||||
_key_block += 32;
|
||||
|
||||
SecureZeroMemory(&key_block, sizeof(key_block));
|
||||
|
||||
|
@@ -24,7 +24,6 @@
|
||||
#include "../include/Credentials.h"
|
||||
#include "../include/Method.h"
|
||||
#include "../include/Module.h"
|
||||
#include "../include/TTLS.h"
|
||||
|
||||
#include "../../PAP/include/Config.h"
|
||||
#include "../../PAP/include/Method.h"
|
||||
|
Reference in New Issue
Block a user