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

Clean-up

Browse Source
This commit is contained in:
Simon Rozman 2016-09-28 10:43:20 +02:00
parent da0e75a4a3
commit 6471a200c6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,14 +202,13 @@ void eap::peer_ttls_ui::invoke_identity_ui(
credentials_ttls *_cred_method = (credentials_ttls*)cfg_method->make_credentials(); credentials_ttls *_cred_method = (credentials_ttls*)cfg_method->make_credentials();
cred_method.m_cred.reset(_cred_method); cred_method.m_cred.reset(_cred_method);
#ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE
bool is_own = cred_in.m_cred && cred_in.match(*cfg_prov); bool has_cached = cred_in.m_cred && cred_in.match(*cfg_prov);
#endif #endif
// Combine outer credentials. // Combine outer credentials.
LPCTSTR _target_name = (dwFlags & EAP_FLAG_GUEST_ACCESS) == 0 ? target_name.c_str() : NULL;
eap::credentials::source_t src_outer = _cred_method->credentials_tls::combine( eap::credentials::source_t src_outer = _cred_method->credentials_tls::combine(
#ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE
is_own ? cred_in.m_cred.get() : NULL, has_cached ? cred_in.m_cred.get() : NULL,
#else #else
NULL, NULL,
#endif #endif
@ -219,7 +218,7 @@ void eap::peer_ttls_ui::invoke_identity_ui(
// Combine inner credentials. // Combine inner credentials.
eap::credentials::source_t src_inner = _cred_method->m_inner->combine( eap::credentials::source_t src_inner = _cred_method->m_inner->combine(
#ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE
is_own ? ((credentials_ttls*)cred_in.m_cred.get())->m_inner.get() : NULL, has_cached ? ((credentials_ttls*)cred_in.m_cred.get())->m_inner.get() : NULL,
#else #else
NULL, NULL,
#endif #endif