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

config_method::m_preshared moved to heap, which in turn required shift to virtual methods for packing/unpacking BLOBs

Browse Source
This commit is contained in:
Simon Rozman
2016-07-20 14:59:12 +02:00
parent 3e82e988d4
commit ce0bbc5b45
17 changed files with 620 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,34 +28,6 @@ namespace eap
class config_method_ttls;
}
namespace eapserial
{
///
/// Packs a TTLS based method configuration
///
/// \param[inout] cursor Memory cursor
/// \param[in] val Configuration to pack
///
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::config_method_ttls &val);
///
/// Returns packed size of a TTLS based method configuration
///
/// \param[in] val Configuration to pack
///
/// \returns Size of data when packed (in bytes)
///
inline size_t get_pk_size(const eap::config_method_ttls &val);
///
/// Unpacks a TTLS based method configuration
///
/// \param[inout] cursor Memory cursor
/// \param[out] val Configuration to unpack to
///
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::config_method_ttls &val);
}
#pragma once
#include "../../TLS/include/Config.h"
@@ -147,6 +119,30 @@ namespace eap {
/// @}
/// \name BLOB management
/// @{
///
/// Packs a configuration
///
/// \param[inout] cursor Memory cursor
///
virtual void pack(_Inout_ unsigned char *&cursor) const;
///
/// Returns packed size of a configuration
///
/// \returns Size of data when packed (in bytes)
///
virtual size_t get_pk_size() const;
///
/// Unpacks a configuration
///
/// \param[inout] cursor Memory cursor
///
virtual void unpack(_Inout_ const unsigned char *&cursor);
///
/// Returns EAP method type of this configuration
///
@@ -158,61 +154,3 @@ namespace eap {
std::unique_ptr<config> m_inner; ///< Inner authentication configuration
};
}
namespace eapserial
{
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::config_method_ttls &val)
{
pack(cursor, (const eap::config_method_tls&)val);
if (val.m_inner) {
if (dynamic_cast<eap::config_method_pap*>(val.m_inner.get())) {
pack(cursor, eap::type_pap);
pack(cursor, (const eap::config_method_pap&)*val.m_inner);
} else {
assert(0); // Unsupported inner authentication method type.
pack(cursor, eap::type_undefined);
}
} else
pack(cursor, eap::type_undefined);
}
inline size_t get_pk_size(const eap::config_method_ttls &val)
{
size_t size_inner;
if (val.m_inner) {
if (dynamic_cast<eap::config_method_pap*>(val.m_inner.get())) {
size_inner =
get_pk_size(eap::type_pap) +
get_pk_size((const eap::config_method_pap&)*val.m_inner);
} else {
assert(0); // Unsupported inner authentication method type.
size_inner = get_pk_size(eap::type_undefined);
}
} else
size_inner = get_pk_size(eap::type_undefined);
return
get_pk_size((const eap::config_method_tls&)val) +
size_inner;
}
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::config_method_ttls &val)
{
unpack(cursor, (eap::config_method_tls&)val);
eap::type_t eap_type;
unpack(cursor, eap_type);
switch (eap_type) {
case eap::type_pap:
val.m_inner.reset(new eap::config_method_pap(val.m_module));
unpack(cursor, (eap::config_method_pap&)*val.m_inner);
break;
default:
assert(0); // Unsupported inner authentication method type.
val.m_inner.reset(nullptr);
}
}
}

110
lib/TTLS/include/Credentials.h
View File

@@ -26,34 +26,6 @@ namespace eap
class credentials_ttls;
}
namespace eapserial
{
///
/// Packs a TTLS based method credentials
///
/// \param[inout] cursor Memory cursor
/// \param[in] val Configuration to pack
///
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::credentials_ttls &val);
///
/// Returns packed size of a TTLS based method credentials
///
/// \param[in] val Configuration to pack
///
/// \returns Size of data when packed (in bytes)
///
inline size_t get_pk_size(const eap::credentials_ttls &val);
///
/// Unpacks a TTLS based method credentials
///
/// \param[inout] cursor Memory cursor
/// \param[out] val Configuration to unpack to
///
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::credentials_ttls &val);
}
#pragma once
#include "../../TLS/include/Credentials.h"
@@ -153,6 +125,30 @@ namespace eap
/// @}
/// \name BLOB management
/// @{
///
/// Packs a configuration
///
/// \param[inout] cursor Memory cursor
///
virtual void pack(_Inout_ unsigned char *&cursor) const;
///
/// Returns packed size of a configuration
///
/// \returns Size of data when packed (in bytes)
///
virtual size_t get_pk_size() const;
///
/// Unpacks a configuration
///
/// \param[inout] cursor Memory cursor
///
virtual void unpack(_Inout_ const unsigned char *&cursor);
/// \name Storage
/// @{
@@ -186,61 +182,3 @@ namespace eap
std::unique_ptr<credentials> m_inner; ///< Inner credentials
};
}
namespace eapserial
{
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::credentials_ttls &val)
{
pack(cursor, (const eap::credentials_tls&)val);
if (val.m_inner) {
if (dynamic_cast<eap::credentials_pap*>(val.m_inner.get())) {
pack(cursor, eap::type_pap);
pack(cursor, (const eap::credentials_pap&)*val.m_inner);
} else {
assert(0); // Unsupported inner authentication method type.
pack(cursor, eap::type_undefined);
}
} else
pack(cursor, eap::type_undefined);
}
inline size_t get_pk_size(const eap::credentials_ttls &val)
{
size_t size_inner;
if (val.m_inner) {
if (dynamic_cast<eap::credentials_pap*>(val.m_inner.get())) {
size_inner =
get_pk_size(eap::type_pap) +
get_pk_size((const eap::credentials_pap&)*val.m_inner);
} else {
assert(0); // Unsupported inner authentication method type.
size_inner = get_pk_size(eap::type_undefined);
}
} else
size_inner = get_pk_size(eap::type_undefined);
return
get_pk_size((const eap::credentials_tls&)val) +
size_inner;
}
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::credentials_ttls &val)
{
unpack(cursor, (eap::credentials_tls&)val);
eap::type_t eap_type;
unpack(cursor, eap_type);
switch (eap_type) {
case eap::type_pap:
val.m_inner.reset(new eap::credentials_pap(val.m_module));
unpack(cursor, (eap::credentials_pap&)*val.m_inner);
break;
default:
assert(0); // Unsupported inner authentication method type.
val.m_inner.reset(nullptr);
}
}
}

55
lib/TTLS/src/Config.cpp
View File

@@ -158,6 +158,61 @@ bool eap::config_method_ttls::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERRO
}
void eap::config_method_ttls::pack(_Inout_ unsigned char *&cursor) const
{
eap::config_method_tls::pack(cursor);
if (m_inner) {
if (dynamic_cast<eap::config_method_pap*>(m_inner.get())) {
eapserial::pack(cursor, eap::type_pap);
m_inner->pack(cursor);
} else {
assert(0); // Unsupported inner authentication method type.
eapserial::pack(cursor, eap::type_undefined);
}
} else
eapserial::pack(cursor, eap::type_undefined);
}
size_t eap::config_method_ttls::get_pk_size() const
{
size_t size_inner;
if (m_inner) {
if (dynamic_cast<eap::config_method_pap*>(m_inner.get())) {
size_inner =
eapserial::get_pk_size(eap::type_pap) +
m_inner->get_pk_size();
} else {
assert(0); // Unsupported inner authentication method type.
size_inner = eapserial::get_pk_size(eap::type_undefined);
}
} else
size_inner = eapserial::get_pk_size(eap::type_undefined);
return
eap::config_method_tls::get_pk_size() +
size_inner;
}
void eap::config_method_ttls::unpack(_Inout_ const unsigned char *&cursor)
{
eap::config_method_tls::unpack(cursor);
eap::type_t eap_type;
eapserial::unpack(cursor, eap_type);
switch (eap_type) {
case eap::type_pap:
m_inner.reset(new eap::config_method_pap(m_module));
m_inner->unpack(cursor);
break;
default:
assert(0); // Unsupported inner authentication method type.
m_inner.reset(nullptr);
}
}
eap::type_t eap::config_method_ttls::get_method_id() const
{
return eap::type_ttls;

55
lib/TTLS/src/Credentials.cpp
View File

@@ -149,6 +149,61 @@ bool eap::credentials_ttls::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR
}
void eap::credentials_ttls::pack(_Inout_ unsigned char *&cursor) const
{
eap::credentials_tls::pack(cursor);
if (m_inner) {
if (dynamic_cast<eap::credentials_pap*>(m_inner.get())) {
eapserial::pack(cursor, eap::type_pap);
m_inner->pack(cursor);
} else {
assert(0); // Unsupported inner authentication method type.
eapserial::pack(cursor, eap::type_undefined);
}
} else
eapserial::pack(cursor, eap::type_undefined);
}
size_t eap::credentials_ttls::get_pk_size() const
{
size_t size_inner;
if (m_inner) {
if (dynamic_cast<eap::credentials_pap*>(m_inner.get())) {
size_inner =
eapserial::get_pk_size(eap::type_pap) +
m_inner->get_pk_size();
} else {
assert(0); // Unsupported inner authentication method type.
size_inner = eapserial::get_pk_size(eap::type_undefined);
}
} else
size_inner = eapserial::get_pk_size(eap::type_undefined);
return
eap::credentials_tls::get_pk_size() +
size_inner;
}
void eap::credentials_ttls::unpack(_Inout_ const unsigned char *&cursor)
{
eap::credentials_tls::unpack(cursor);
eap::type_t eap_type;
eapserial::unpack(cursor, eap_type);
switch (eap_type) {
case eap::type_pap:
m_inner.reset(new eap::credentials_pap(m_module));
m_inner->unpack(cursor);
break;
default:
assert(0); // Unsupported inner authentication method type.
m_inner.reset(nullptr);
}
}
bool eap::credentials_ttls::store(_In_ LPCTSTR pszTargetName, _Out_ EAP_ERROR **ppEapError) const
{
if (!credentials_tls::store(pszTargetName, ppEapError))