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

Class naming update

Browse Source
This commit is contained in:
Simon Rozman
2016-07-20 10:37:12 +02:00
parent 512f46f014
commit 434e042f8b
16 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/TLS/include/Config.h
View File

@@ -30,7 +30,7 @@ namespace eap
///
/// TLS configuration
///
class config_tls;
class config_method_tls;
///
/// Helper function to compile human-readable certificate name for UI display
@@ -46,7 +46,7 @@ namespace eapserial
/// \param[inout] cursor Memory cursor
/// \param[in] val Configuration to pack
///
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::config_tls &val);
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::config_method_tls &val);
///
/// Returns packed size of a TLS method configuration
@@ -55,7 +55,7 @@ namespace eapserial
///
/// \returns Size of data when packed (in bytes)
///
inline size_t get_pk_size(const eap::config_tls &val);
inline size_t get_pk_size(const eap::config_method_tls &val);
///
/// Unpacks a TLS method configuration
@@ -63,7 +63,7 @@ namespace eapserial
/// \param[inout] cursor Memory cursor
/// \param[out] val Configuration to unpack to
///
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::config_tls &val);
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::config_method_tls &val);
}
#pragma once
@@ -82,7 +82,7 @@ namespace eapserial
namespace eap
{
class config_tls : public config_method<credentials_tls>
class config_method_tls : public config_method<credentials_tls>
{
public:
///
@@ -90,21 +90,21 @@ namespace eap
///
/// \param[in] mod Reference of the EAP module to use for global services
///
config_tls(_In_ module &mod);
config_method_tls(_In_ module &mod);
///
/// Copies configuration
///
/// \param[in] other Configuration to copy from
///
config_tls(_In_ const config_tls &other);
config_method_tls(_In_ const config_method_tls &other);
///
/// Moves configuration
///
/// \param[in] other Configuration to move from
///
config_tls(_Inout_ config_tls &&other);
config_method_tls(_Inout_ config_method_tls &&other);
///
/// Copies configuration
@@ -113,7 +113,7 @@ namespace eap
///
/// \returns Reference to this object
///
config_tls& operator=(_In_ const config_tls &other);
config_method_tls& operator=(_In_ const config_method_tls &other);
///
/// Moves configuration
@@ -122,7 +122,7 @@ namespace eap
///
/// \returns Reference to this object
///
config_tls& operator=(_Inout_ config_tls &&other);
config_method_tls& operator=(_Inout_ config_method_tls &&other);
///
/// Clones configuration
@@ -184,7 +184,7 @@ namespace eap
namespace eapserial
{
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::config_tls &val)
inline void pack(_Inout_ unsigned char *&cursor, _In_ const eap::config_method_tls &val)
{
pack(cursor, (const eap::config_method<eap::credentials_tls>&)val);
pack(cursor, val.m_trusted_root_ca);
@@ -192,7 +192,7 @@ namespace eapserial
}
inline size_t get_pk_size(const eap::config_tls &val)
inline size_t get_pk_size(const eap::config_method_tls &val)
{
return
get_pk_size((const eap::config_method<eap::credentials_tls>&)val) +
@@ -201,7 +201,7 @@ namespace eapserial
}
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::config_tls &val)
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ eap::config_method_tls &val)
{
unpack(cursor, (eap::config_method<eap::credentials_tls>&)val);
unpack(cursor, val.m_trusted_root_ca);

24
lib/TLS/src/Config.cpp
View File

@@ -63,15 +63,15 @@ tstring eap::get_cert_title(PCCERT_CONTEXT cert)
//////////////////////////////////////////////////////////////////////
// eap::config_tls
// eap::config_method_tls
//////////////////////////////////////////////////////////////////////
eap::config_tls::config_tls(_In_ module &mod) : config_method<credentials_tls>(mod)
eap::config_method_tls::config_method_tls(_In_ module &mod) : config_method<credentials_tls>(mod)
{
}
eap::config_tls::config_tls(_In_ const config_tls &other) :
eap::config_method_tls::config_method_tls(_In_ const config_method_tls &other) :
m_trusted_root_ca(other.m_trusted_root_ca),
m_server_names(other.m_server_names),
config_method<credentials_tls>(other)
@@ -79,7 +79,7 @@ eap::config_tls::config_tls(_In_ const config_tls &other) :
}
eap::config_tls::config_tls(_Inout_ config_tls &&other) :
eap::config_method_tls::config_method_tls(_Inout_ config_method_tls &&other) :
m_trusted_root_ca(std::move(other.m_trusted_root_ca)),
m_server_names(std::move(other.m_server_names)),
config_method<credentials_tls>(std::move(other))
@@ -87,7 +87,7 @@ eap::config_tls::config_tls(_Inout_ config_tls &&other) :
}
eap::config_tls& eap::config_tls::operator=(_In_ const eap::config_tls &other)
eap::config_method_tls& eap::config_method_tls::operator=(_In_ const eap::config_method_tls &other)
{
if (this != &other) {
(config_method<credentials_tls>&)*this = other;
@@ -99,7 +99,7 @@ eap::config_tls& eap::config_tls::operator=(_In_ const eap::config_tls &other)
}
eap::config_tls& eap::config_tls::operator=(_Inout_ eap::config_tls &&other)
eap::config_method_tls& eap::config_method_tls::operator=(_Inout_ eap::config_method_tls &&other)
{
if (this != &other) {
(config_method<credentials_tls>&&)*this = std::move(other);
@@ -111,13 +111,13 @@ eap::config_tls& eap::config_tls::operator=(_Inout_ eap::config_tls &&other)
}
eap::config* eap::config_tls::clone() const
eap::config* eap::config_method_tls::clone() const
{
return new config_tls(*this);
return new config_method_tls(*this);
}
bool eap::config_tls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError) const
bool eap::config_method_tls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError) const
{
assert(pDoc);
assert(pConfigRoot);
@@ -178,7 +178,7 @@ bool eap::config_tls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfig
}
bool eap::config_tls::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError)
bool eap::config_method_tls::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError)
{
assert(pConfigRoot);
@@ -256,13 +256,13 @@ bool eap::config_tls::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEa
}
eap::type_t eap::config_tls::get_method_id() const
eap::type_t eap::config_method_tls::get_method_id() const
{
return eap::type_tls;
}
bool eap::config_tls::add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ const BYTE *pbCertEncoded, _In_ DWORD cbCertEncoded)
bool eap::config_method_tls::add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ const BYTE *pbCertEncoded, _In_ DWORD cbCertEncoded)
{
cert_context cert;
if (!cert.create(dwCertEncodingType, pbCertEncoded, cbCertEncoded)) {