Identity selection revised to support cases where TLS certificate is present but contains no usable username

2016-08-28 16:38:13 +02:00
parent 8ce7154a77
commit d20aafb3ff
1 changed files with 4 additions and 3 deletions
--- a/lib/TTLS/src/Credentials.cpp
+++ b/lib/TTLS/src/Credentials.cpp
@@ -216,11 +216,12 @@ LPCTSTR eap::credentials_ttls::target_suffix() const
 }


-std::wstring eap::credentials_ttls::get_identity() const
+wstring eap::credentials_ttls::get_identity() const
 {
    // Outer identity has the right-of-way.
-    if (!credentials_tls::empty())
-        return credentials_tls::get_identity();
+    wstring identity(credentials_tls::get_identity());
+    if (!identity.empty())
+        return identity;

    // Inner identity.
    if (m_inner)