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

usr => cred

Browse Source
This commit is contained in:
Simon Rozman 2016-07-20 11:27:23 +02:00
parent 43751ed908
commit db69c23689
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
EAPMethods/src/Main.cpp
View File

@ -237,11 +237,11 @@ DWORD APIENTRY EapPeerGetIdentity(
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL."))); g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
else { else {
_EAPMETHOD_PEER::config_providers_type cfg(g_peer); _EAPMETHOD_PEER::config_providers_type cfg(g_peer);
_EAPMETHOD_PEER::credentials_type usr(g_peer); _EAPMETHOD_PEER::credentials_type cred(g_peer);
if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) || if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) ||
!g_peer.unpack(usr, pUserData, dwUserDataSize, ppEapError) || !g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||
!g_peer.get_identity(dwFlags, cfg, usr, hTokenImpersonateUser, pfInvokeUI, ppwszIdentity, ppEapError) || !g_peer.get_identity(dwFlags, cfg, cred, hTokenImpersonateUser, pfInvokeUI, ppwszIdentity, ppEapError) ||
!g_peer.pack(usr, ppUserDataOut, pdwUserDataOutSize, ppEapError)) !g_peer.pack(cred, ppUserDataOut, pdwUserDataOutSize, ppEapError))
{ {
if (*ppEapError) { if (*ppEapError) {
g_peer.log_error(*ppEapError); g_peer.log_error(*ppEapError);
@ -685,15 +685,15 @@ DWORD WINAPI EapPeerGetMethodProperties(
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pMethodPropertyArray is NULL."))); g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pMethodPropertyArray is NULL.")));
else { else {
_EAPMETHOD_PEER::config_providers_type cfg(g_peer); _EAPMETHOD_PEER::config_providers_type cfg(g_peer);
_EAPMETHOD_PEER::credentials_type usr(g_peer); _EAPMETHOD_PEER::credentials_type cred(g_peer);
if (!g_peer.unpack(cfg, pEapConnData, dwEapConnDataSize, ppEapError) || if (!g_peer.unpack(cfg, pEapConnData, dwEapConnDataSize, ppEapError) ||
!g_peer.unpack(usr, pUserData, dwUserDataSize, ppEapError) || !g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||
!g_peer.get_method_properties( !g_peer.get_method_properties(
dwVersion, dwVersion,
dwFlags, dwFlags,
hUserImpersonationToken, hUserImpersonationToken,
cfg, cfg,
usr, cred,
pMethodPropertyArray, pMethodPropertyArray,
ppEapError)) ppEapError))
{ {
@ -762,9 +762,9 @@ DWORD WINAPI EapPeerCredentialsXml2Blob(
// Load credentials. // Load credentials.
pCredentialsDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\"")); pCredentialsDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
_EAPMETHOD_PEER::credentials_type usr(g_peer); _EAPMETHOD_PEER::credentials_type cred(g_peer);
if (!usr.load(pXmlElCredentials, ppEapError) || if (!cred.load(pXmlElCredentials, ppEapError) ||
!g_peer.pack(usr, ppCredentialsOut, pdwCredentialsOutSize, ppEapError)) !g_peer.pack(cred, ppCredentialsOut, pdwCredentialsOutSize, ppEapError))
{ {
if (*ppEapError) { if (*ppEapError) {
g_peer.log_error(*ppEapError); g_peer.log_error(*ppEapError);

8
EAPMethods/src/Main_UI.cpp
View File

@ -360,11 +360,11 @@ DWORD WINAPI EapPeerInvokeIdentityUI(
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL."))); g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
else { else {
_EAPMETHOD_PEER_UI::config_providers_type cfg(g_peer); _EAPMETHOD_PEER_UI::config_providers_type cfg(g_peer);
_EAPMETHOD_PEER_UI::credentials_type usr(g_peer); _EAPMETHOD_PEER_UI::credentials_type cred(g_peer);
if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) || if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) ||
!g_peer.unpack(usr, pUserData, dwUserDataSize, ppEapError) || !g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||
!g_peer.invoke_identity_ui(hwndParent, dwFlags, cfg, usr, ppwszIdentity, ppEapError) || !g_peer.invoke_identity_ui(hwndParent, dwFlags, cfg, cred, ppwszIdentity, ppEapError) ||
!g_peer.pack(usr, ppUserDataOut, pdwUserDataOutSize, ppEapError)) !g_peer.pack(cred, ppUserDataOut, pdwUserDataOutSize, ppEapError))
{ {
if (*ppEapError) { if (*ppEapError) {
g_peer.log_error(*ppEapError); g_peer.log_error(*ppEapError);

4
lib/EAPBase/include/Module.h
View File

@ -739,7 +739,7 @@ namespace eap
virtual bool get_identity( virtual bool get_identity(
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ const config_providers_type &cfg, _In_ const config_providers_type &cfg,
_Inout_ credentials_type &usr, _Inout_ credentials_type &cred,
_In_ HANDLE hTokenImpersonateUser, _In_ HANDLE hTokenImpersonateUser,
_Out_ BOOL *pfInvokeUI, _Out_ BOOL *pfInvokeUI,
_Out_ WCHAR **ppwszIdentity, _Out_ WCHAR **ppwszIdentity,
@ -759,7 +759,7 @@ namespace eap
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ HANDLE hUserImpersonationToken, _In_ HANDLE hUserImpersonationToken,
_In_ const config_providers_type &cfg, _In_ const config_providers_type &cfg,
_In_ const credentials_type &usr, _In_ const credentials_type &cred,
_Out_ EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray, _Out_ EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
_Out_ EAP_ERROR **ppEapError) const = 0; _Out_ EAP_ERROR **ppEapError) const = 0;

4
lib/EAPBase_UI/include/Module.h
View File

@ -70,7 +70,7 @@ namespace eap
/// \param[in] hwndParent Parent window /// \param[in] hwndParent Parent window
/// \param[in] dwFlags Flags passed to `EapPeerInvokeIdentityUI()` call /// \param[in] dwFlags Flags passed to `EapPeerInvokeIdentityUI()` call
/// \param[inout] cfg Configuration /// \param[inout] cfg Configuration
/// \param[inout] usr User data to edit /// \param[inout] cred User credentials to edit
/// \param[out] ppwszIdentity Pointer to user identity. Free using `module::free_memory()`. /// \param[out] ppwszIdentity Pointer to user identity. Free using `module::free_memory()`.
/// \param[out] ppEapError Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`. /// \param[out] ppEapError Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`.
/// ///
@ -82,7 +82,7 @@ namespace eap
_In_ HWND hwndParent, _In_ HWND hwndParent,
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_Inout_ config_providers_type &cfg, _Inout_ config_providers_type &cfg,
_Inout_ credentials_type &usr, _Inout_ credentials_type &cred,
_Out_ LPWSTR *ppwszIdentity, _Out_ LPWSTR *ppwszIdentity,
_Out_ EAP_ERROR **ppEapError) = 0; _Out_ EAP_ERROR **ppEapError) = 0;

4
lib/TTLS/include/Module.h
View File

@ -77,7 +77,7 @@ namespace eap
virtual bool get_identity( virtual bool get_identity(
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ const config_providers_type &cfg, _In_ const config_providers_type &cfg,
_Inout_ credentials_type &usr, _Inout_ credentials_type &cred,
_In_ HANDLE hTokenImpersonateUser, _In_ HANDLE hTokenImpersonateUser,
_Out_ BOOL *pfInvokeUI, _Out_ BOOL *pfInvokeUI,
_Out_ WCHAR **ppwszIdentity, _Out_ WCHAR **ppwszIdentity,
@ -97,7 +97,7 @@ namespace eap
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ HANDLE hUserImpersonationToken, _In_ HANDLE hUserImpersonationToken,
_In_ const config_providers_type &cfg, _In_ const config_providers_type &cfg,
_In_ const credentials_type &usr, _In_ const credentials_type &cred,
_Out_ EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray, _Out_ EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
_Out_ EAP_ERROR **ppEapError) const; _Out_ EAP_ERROR **ppEapError) const;
}; };

8
lib/TTLS/src/Module.cpp
View File

@ -61,7 +61,7 @@ bool eap::peer_ttls::shutdown(_Out_ EAP_ERROR **ppEapError)
bool eap::peer_ttls::get_identity( bool eap::peer_ttls::get_identity(
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ const config_providers_type &cfg, _In_ const config_providers_type &cfg,
_Inout_ credentials_type &usr, _Inout_ credentials_type &cred,
_In_ HANDLE hTokenImpersonateUser, _In_ HANDLE hTokenImpersonateUser,
_Out_ BOOL *pfInvokeUI, _Out_ BOOL *pfInvokeUI,
_Out_ WCHAR **ppwszIdentity, _Out_ WCHAR **ppwszIdentity,
@ -69,7 +69,7 @@ bool eap::peer_ttls::get_identity(
{ {
UNREFERENCED_PARAMETER(dwFlags); UNREFERENCED_PARAMETER(dwFlags);
UNREFERENCED_PARAMETER(cfg); UNREFERENCED_PARAMETER(cfg);
UNREFERENCED_PARAMETER(usr); UNREFERENCED_PARAMETER(cred);
UNREFERENCED_PARAMETER(hTokenImpersonateUser); UNREFERENCED_PARAMETER(hTokenImpersonateUser);
UNREFERENCED_PARAMETER(pfInvokeUI); UNREFERENCED_PARAMETER(pfInvokeUI);
UNREFERENCED_PARAMETER(ppwszIdentity); UNREFERENCED_PARAMETER(ppwszIdentity);
@ -85,7 +85,7 @@ bool eap::peer_ttls::get_method_properties(
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ HANDLE hUserImpersonationToken, _In_ HANDLE hUserImpersonationToken,
_In_ const config_providers_type &cfg, _In_ const config_providers_type &cfg,
_In_ const credentials_type &usr, _In_ const credentials_type &cred,
_Out_ EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray, _Out_ EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
_Out_ EAP_ERROR **ppEapError) const _Out_ EAP_ERROR **ppEapError) const
{ {
@ -93,7 +93,7 @@ bool eap::peer_ttls::get_method_properties(
UNREFERENCED_PARAMETER(dwFlags); UNREFERENCED_PARAMETER(dwFlags);
UNREFERENCED_PARAMETER(hUserImpersonationToken); UNREFERENCED_PARAMETER(hUserImpersonationToken);
UNREFERENCED_PARAMETER(cfg); UNREFERENCED_PARAMETER(cfg);
UNREFERENCED_PARAMETER(usr); UNREFERENCED_PARAMETER(cred);
UNREFERENCED_PARAMETER(pMethodPropertyArray); UNREFERENCED_PARAMETER(pMethodPropertyArray);
UNREFERENCED_PARAMETER(ppEapError); UNREFERENCED_PARAMETER(ppEapError);

4
lib/TTLS_UI/include/Module.h
View File

@ -69,7 +69,7 @@ namespace eap
/// \param[in] hwndParent Parent window /// \param[in] hwndParent Parent window
/// \param[in] dwFlags Flags passed to `EapPeerInvokeIdentityUI()` call /// \param[in] dwFlags Flags passed to `EapPeerInvokeIdentityUI()` call
/// \param[inout] cfg Configuration /// \param[inout] cfg Configuration
/// \param[inout] usr User data to edit /// \param[inout] cred User credentials to edit
/// \param[out] ppwszIdentity Pointer to user identity. Free using `module::free_memory()`. /// \param[out] ppwszIdentity Pointer to user identity. Free using `module::free_memory()`.
/// \param[out] ppEapError Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`. /// \param[out] ppEapError Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`.
/// ///
@ -81,7 +81,7 @@ namespace eap
_In_ HWND hwndParent, _In_ HWND hwndParent,
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_Inout_ config_providers_type &cfg, _Inout_ config_providers_type &cfg,
_Inout_ credentials_type &usr, _Inout_ credentials_type &cred,
_Out_ LPWSTR *ppwszIdentity, _Out_ LPWSTR *ppwszIdentity,
_Out_ EAP_ERROR **ppEapError); _Out_ EAP_ERROR **ppEapError);

4
lib/TTLS_UI/src/Module.cpp
View File

@ -72,13 +72,13 @@ bool eap::peer_ttls_ui::invoke_identity_ui(
_In_ HWND hwndParent, _In_ HWND hwndParent,
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_Inout_ config_providers_type &cfg, _Inout_ config_providers_type &cfg,
_Inout_ credentials_type &usr, _Inout_ credentials_type &cred,
_Out_ LPWSTR *ppwszIdentity, _Out_ LPWSTR *ppwszIdentity,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
UNREFERENCED_PARAMETER(dwFlags); UNREFERENCED_PARAMETER(dwFlags);
UNREFERENCED_PARAMETER(cfg); UNREFERENCED_PARAMETER(cfg);
UNREFERENCED_PARAMETER(usr); UNREFERENCED_PARAMETER(cred);
UNREFERENCED_PARAMETER(ppwszIdentity); UNREFERENCED_PARAMETER(ppwszIdentity);
UNREFERENCED_PARAMETER(ppEapError); UNREFERENCED_PARAMETER(ppEapError);