Our own TLS merged back to master and compiles conditionally

2016-08-23 22:46:00 +02:00
parent a9baa07227
commit 5332b538aa
11 changed files with 1800 additions and 34 deletions
--- a/lib/TLS_UI/include/TLS_UI.h
+++ b/lib/TLS_UI/include/TLS_UI.h
@@ -331,6 +331,9 @@ public:
 protected:
    /// \cond internal
    virtual void OnInitDialog(wxInitDialogEvent& event);
+#if EAP_TLS < EAP_TLS_SCHANNEL
+    virtual bool TransferDataFromWindow();
+#endif
    /// \endcond

 protected: