ui_context: Merge with ui_context_tls_tunnel

Signed-off-by: Simon Rozman <simon@rozman.si>
2020-02-04 11:18:06 +01:00
parent bef455e5a6
commit c40f71462f
10 changed files with 13 additions and 201 deletions
--- a/lib/TTLS_UI/src/Module.cpp
+++ b/lib/TTLS_UI/src/Module.cpp
@@ -352,7 +352,7 @@ void eap::peer_ttls_ui::invoke_interactive_ui(
    // Unpack context data.
    config_connection cfg(*this);
    credentials_connection cred(*this, cfg);
-    ui_context_tls_tunnel ctx(cfg, cred);
+    ui_context ctx(cfg, cred);
    unpack(ctx, pUIContextData, dwUIContextDataSize);

    // Look-up the provider.
--- a/lib/TTLS_UI/src/StdAfx.h
+++ b/lib/TTLS_UI/src/StdAfx.h
@@ -32,6 +32,6 @@
 #include "../../GTC_UI/include/GTC_UI.h"

 #include "../../EapHost/include/Credentials.h"
-#include "../../TTLS/include/UIContext.h"
+#include "../../EapBase/include/UIContext.h"

 #include <wx/choicdlg.h>