From 98273c6bdcb8ac85f77fcaa9066fc787f2820460 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 9 Jun 2016 15:12:42 +0200 Subject: [PATCH] UI development continues... --- CredWrite/CredWrite.vcxproj | 1 + CredWrite/CredWrite.vcxproj.filters | 3 + CredWrite/Main.cpp | Bin 7122 -> 7036 bytes CredWrite/StdAfx.h | Bin 2056 -> 2136 bytes EAPMethods/Doxyfile | 2 +- EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj | 2 + .../EAPTTLSUI/EAPTTLSUI.vcxproj.filters | 6 ++ EAPMethods/EAPTTLSUI/StdAfx.h | Bin 3412 -> 3476 bytes EAPMethods/include/EAP.h | Bin 114058 -> 121934 bytes EAPMethods/include/EAP_UI.h | Bin 26666 -> 30488 bytes EAPMethods/include/PAP.h | Bin 7138 -> 10940 bytes EAPMethods/include/PAP_UI.h | 53 ++++++++++++++ EAPMethods/include/TLS.h | Bin 20800 -> 21918 bytes EAPMethods/include/TLS_UI.h | Bin 15552 -> 18166 bytes EAPMethods/include/TTLS.h | Bin 13802 -> 26784 bytes EAPMethods/include/TTLS_UI.h | Bin 12116 -> 12954 bytes EAPMethods/res/wxEAP_UI.cpp | 38 +++++----- EAPMethods/res/wxEAP_UI.fbp | 10 +-- EAPMethods/res/wxEAP_UI.h | 4 ++ EAPMethods/res/wxTLS_UI.cpp | 24 +++---- EAPMethods/res/wxTLS_UI.fbp | 2 +- EAPMethods/res/wxTLS_UI.h | 8 +-- EAPMethods/src/EAP.cpp | Bin 71356 -> 51790 bytes EAPMethods/src/EAP_UI.cpp | Bin 6526 -> 7040 bytes EAPMethods/src/Main.cpp | Bin 73940 -> 77020 bytes EAPMethods/src/Main_UI.cpp | Bin 45866 -> 45882 bytes EAPMethods/src/PAP.cpp | Bin 3148 -> 4926 bytes EAPMethods/src/PAP_UI.cpp | 68 ++++++++++++++++++ EAPMethods/src/TLS.cpp | Bin 25160 -> 24414 bytes EAPMethods/src/TLS_UI.cpp | Bin 39498 -> 42482 bytes EAPMethods/src/TTLS.cpp | Bin 12474 -> 25746 bytes EAPMethods/src/TTLS_UI.cpp | Bin 15832 -> 18004 bytes 32 files changed, 182 insertions(+), 39 deletions(-) create mode 100644 EAPMethods/include/PAP_UI.h create mode 100644 EAPMethods/src/PAP_UI.cpp diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index bf84d36..d739791 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -87,6 +87,7 @@ + Create diff --git a/CredWrite/CredWrite.vcxproj.filters b/CredWrite/CredWrite.vcxproj.filters index 7e3a58f..d59c8f1 100644 --- a/CredWrite/CredWrite.vcxproj.filters +++ b/CredWrite/CredWrite.vcxproj.filters @@ -29,6 +29,9 @@ Source Files + + Source Files + diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp index 33c96be605f0f7ad28b2f8b1e28eea141cc2e34a..8debf3aec456b8a987d1d81b066a01ed50a996d2 100644 GIT binary patch delta 54 zcmV-60LlN-H~coRatZ-(vvmq(29ppGu(QGuvH_EJ6V3^90CNCo0A~PhlT8#QlL87D MlcE$nv)~l+1||>_9smFU delta 142 zcmexkcFBB05f^hYL-FQfu2eQ-4Tg9I9|jGE0EQq2e+CzZPzGm)5TKYJgCm14gDa2~ z4CDtfXfh}O)hRLPGbl~A<&d2GPGA^s49oy!AY*CB=BVYvg diff --git a/EAPMethods/Doxyfile b/EAPMethods/Doxyfile index 36bda1b..9a2bda5 100644 --- a/EAPMethods/Doxyfile +++ b/EAPMethods/Doxyfile @@ -789,7 +789,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = res # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index 1472d67..f886e91 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -82,6 +82,7 @@ + @@ -97,6 +98,7 @@ + diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters index 7da1c1c..07f5328 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters @@ -60,6 +60,9 @@ Header Files + + Header Files + @@ -98,6 +101,9 @@ Source Files + + Source Files + diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h index 57e25be34ae7619bb5d4a83a63126c3ac1346c8f..4c12f262d3bec5d14963f55bf054e9ed2d8b2fb6 100644 GIT binary patch delta 46 zcmca2HAQ;E6!yt{>}-=Kaac`02c&1Qf0}%TLtwHDr_|(sYyyk{llj?2H{ao?U;zMw CQxBv7 delta 32 ocmbOteMM@+6!yt{9Bh+sv45J($Ido+7Q5BtGaLe&WjHHX0K$n1tcdy2{YRWCMPbFM( z@AsWQzw`fG{ws3&n{8u#()Mn4igmDNcAj}z%eY6nv;`OAo^Nbst*nh@Gnua1SrhZq zPi7ugN8~LVoOiI!FgHShpA}=kkR0V|p04qL!BvHewv4EDc9yIp0O;yE zi+6uXG6=J@vla}r9Kq3pMsu@z(n=<_vE9q2YczH=pK$UwQy_NS(GcwvGPkPy=(^vC zqg}?0WR``I$udF4e#>n`H-gkmH^qnlWZXK#R4c*`b}`pz(;q`cgbatY%;l^iQLnsI!Y#2bWyH~ zp!JZ$S}BC*`3@&I`TG*2Z0#W0GrUO#S5_6PVP%xSuhLUXq@iLwYsA?3?KEiQH3~$h zhf;}nkT_BtMo}Ig%K#t zBQoFs|2rRYa3Ud=SCoShOYRsGLXmkiWZY5+`_Z>hf{r_K^*RJ3)~;5uot#n2US{R2 zUUiCx9c3<7&D?aWIY=a@sCPTF5)><+j0Br`eUUQDVnuv5owCt7kdYaNC@6Cm$=rpr zLl$Rv>b18avBn$U+HhWFAu8qK$-Nq7_eQU-M|(%!`w*B7WBb@f!-J3ojLE zaFpQh-3bIx)xON%UjY$3q8s8ZS~omL1ujO1=#U%XHLVpZCXvieap(q9sz2 zqsF3*D4#k7{G@YZedb5?Y0N8H&6-v}Ta~t|_exX(&dgdV3VXLutz%wcZmN&;c?m&q zG*aP-51AO4dY600AD7n&4ePYB%&wD*;LVD(G$ zQ8C}~0hsZPc`M&n0Wq(Uk;MPMYFKt&FV1!rDU?u)fEi78W%w|ZJ}2IS^CU*eI0Dxs zaYkb^jSqLhG5&K4IF!LU_(a0pC(6|`h0bEOVc$ajo_cBuqKQ`g!rno;(4R`>Kh(?^h$rUq<51TZ#OuB#0M71*g+?;>D}9XHCc>Q+w5> z>UhN}V$-1XwZpvhEH+`XkYZDyKP>!fKUjiUgnVyyQEFJO-`Zj W2536zN}&AC{2~3En}!9J7hOa_ zh;Mj8Vi}a6SBnq&A}YKKx+s-+WfxsV(b>Bw`7Yjbp65B|JRj$Lcxk@-(^R;r zXe-KqfqJ{qsdd>sQEm2{Qc0_B3~O7z3kJ%^v6fsBJVuTVw27H%lNL>_G_Wjd()KL8 zKg&_kf`0m9K(AQ()gjiN21Ve7n=)_EO~H4#LyP>_tP%Is2m0&%7(q?V^rGH-5WiZ> zjc4p=710|`dga52ZuH|?4Hf-7?2%2OiWoX+wi_d~7-Q)6g`gh3j9WP859(7_@JIy* z^ULTEpH5Wi#y*@^7@*8OyhsnT7|>J0xS&v>9fM-E%T#j>(vXD-$bk!b;0#3h9R`(= zF^(o+2-4zv?9kyhW;&q_e2ktiq1*KRkl^|>r0Co(Ja8+?smgScTZ~HK0FNleE*O;2 zBxE?wFgC)&l5m}~F=kxwUzy-6$4rh*q-AXaQv8<84NEl3b4oU|Y|0K+*2_QvDj zuQoSwZx3W>-GjT$IS6yNBqdaAovSxl2H4OboCcK=No*ir9;?KixXmCD6_1KQ^YL=K zMXz<6`cw+*$Tfr^D(3k#9FI|v#tk{>6elC;a!psgkwSSiN~)46m=w=jy|PdgTK?7* x$FW*&Rjyj+Rol$}@*aJ28b6n}uJb8ul&R7I=o5q?OG#-GODTu`_8HE$`~gs;=C}X= diff --git a/EAPMethods/include/EAP_UI.h b/EAPMethods/include/EAP_UI.h index 9b985d9ab7f1aacedf6bc8b45d21e5dffedc0dc6..fe84eaa90d2c9e4a757280313673c60fac89a85a 100644 GIT binary patch delta 2803 zcmeHJO-x)>6h058bjr_^LI;Mz(8nM!g9x+&rTh$kGgFZ1wEPKLI@9?BiOfKUX`sef z7TT3HZO_KIf-a2dqA|X1o3Jphx~Pc@V+=9Tg$rZp#<((m=e-%)pj8rgYF^&ld(VC6 zobR5W@6O#v%7;HIpMFqudYR&QQWT;Hg=q!z9?T~xN^>+%O{D6p1&Td0Pg0tixUZ;& ztA{N7{*jG;WW}m=mTcwlZ&eQM3+vi(&Y6DUc7^#!5>Qrk_p7u9Ku%Vs>-f7a8-IJ+ z%$M4o9CKB1tINhaUFM9;%$|<2UHST;iEZsAywPsbWy`OZXrHwIsPIjzsUk{Cl*Fl2 zTELjrV~|7y7WuL7MXkT{WG-*}%zUpPPd+b->mO&7v_$t*F3+86{Ci8>-#N^~-IhN$ z#1Guxv)ZJxv-jw{#6O8gvZ2!Q?rIS$*%7RgpESlay@8pG3wReZ^Ed)!>@Hz%8FrSS zbp^Q;shloBaaLMf9PBI8w)(b}jPpkRs-)_W;WCa8Y!)=|M!khMto5wg)k7-GgkdC% zol@?vJC>`G%C`n9k7Gn`!f-X8ftGOt`4Y|X<*CY239w4jdZ1&FuF?vhz0i0W zXKJsl==c|b=4Cob%@_?Wr`}3Vav+Uz!lz%v^tppvdXoiciu`z_`TTT_2FL?VKaJ2J zjbk-VuVFnv6ZrLDoW$$HuAjWnczbXkY9n+ON@t)Df;lftorBYHq{9mkE*@~$`A&XQ zZh}I5qNltvgyb2;FQ6cOy5_N{)g@A~I12p{3INhxt4?a8PFTJ%QpwFh6@{la)?fD_ zr-$xvpu3pW2?yJ1k8-1D%WkAThQL0X>X1?2d}E?caq;GaRm=C9l!GeO<5BsE*KWN) zt#lDUYp55$t$6#49lJ_hScOP((}P-EM3$5ECb_Y8@#VG(-kL4s^8oSAXfe@?|8Rx)&u~i^s1kS{VwE4Dmek$X?V(dlS-FHm3ps3 z{ku7Iv6545HeT<@)3$vcg_FZQ+Wp}jWxq$~e6N##dgb%yGZ=?Yxi}Ea<8MaaVo&r3 z?(wg)Gp0gj;b72t`>@&C13;4~(*)YZXu%X+MMIbK`CiijgAN|J8?bXg2NR;~>3iT?6~|9&2k8v_ifsJt02KO<~oJR|6OgSZ#;*)H2cdPOI8 zA$Wt`gu3JO65hwOf|W1pSxj&<auK>$+juS#RroGlv#N|g~n&h%_hZb%_zE_ra9_yY|(zvB(^a4tN6DeNIIc?%< zdBy~Pa|!xfE@WL{MC^8~x?*CjV!E~>!>&(QHOTL2?n_0pU&HqXJ1QGoW{v8_*T!9m zK{}l6OhspsrXhx%rWvE4-O!mPnc{p1IG+}Eo_F!ECpD=j_=OFb5BTq=UU z^&X+xvzY7bfZCZtzR4o;U9D1a z+$e_2#P&@MQ~oM!cHbz}FGoGeq9*!RI`r5%%9HOez(Vf~W@9$odGuU_20W5*+4NKp?sLGiv{{hKj^Y8!w diff --git a/EAPMethods/include/PAP.h b/EAPMethods/include/PAP.h index 92709cf548c756a8a30d95452177c15aad9ea6fa..1520fa6db5259d0506dad1df0ad61a4920acd234 100644 GIT binary patch delta 1294 zcmbW1&r4fD5Xa|H{F(P&o_QugBxI8wn%IL!2`Z%IBvp7=OUcDF#Fz>(ktF^?MDjNb z^xjjiO0I$y{|qncrN{mYes{H?I3Xy@gPqy$%+BoF&)&_Qe?8qB&MJBs6{=I2+8Bx| z)S@bF;A>Eaw&1T*yH^|j8yYEK+N1`T+#=sZykr1t%gCw-Qjj-I0;8fThvOevIcZ+- zy=+BC(kApZnt7_C3}ub2*W1+Lt{)w0VEcVO3&;Ho)E)YPxHfe2P#$x_o#)G#*ISR& zE&dssNd)wX0+U3joo^?7z6{x^fn9QOEa^)bx?^3@pK|9o7(W-+qM<|4{}2=7?~W&~ zPuZVE|F->J^jls<^bgwSpSKhh|21Db2{EJP)8s|TeWV`{zHsDh9#o*e4T?4A+P~u&ljvmpnPc+PBK#eub6wYE7@M?SyU~K|s z4g5EQ{|2mmb6N%A?NGFWOnP6POGin!P8o%+43(1N-%eJaPi`4p7ibODuF)!DpH@|R gR+aFKOqURqp)_*n_aXiN0Wqh6j;(yJ=g*Gb0|@UIHvj+t delta 22 ecmdlJ`pA4k8QbP{Y&W. +*/ + +#include "PAP.h" + +typedef wxEAPCredentialsConfigPanel wxPAPCredentialsConfigPanel; +class wxPAPConfigPanel; + +#pragma once + + +/// +/// PAP configuration panel +/// +class wxPAPConfigPanel : public wxPanel +{ +public: + /// + /// Constructs a configuration panel + /// + wxPAPConfigPanel(eap::config_pap &cfg, LPCTSTR pszCredTarget, wxWindow* parent); + + /// + /// Destructs the configuration panel + /// + virtual ~wxPAPConfigPanel(); + +protected: + /// \cond internal + virtual void OnInitDialog(wxInitDialogEvent& event); + /// \endcond + +protected: + wxPAPCredentialsConfigPanel *m_credentials; ///< Credentials configuration panel + wxStaticText *m_label; ///< No-configuration notice +}; diff --git a/EAPMethods/include/TLS.h b/EAPMethods/include/TLS.h index f4c4b79c2160a7bc892e48b16556087fd7c037cd..8d443976c3d41e38d21b304b6534df793991db7d 100644 GIT binary patch delta 611 zcmX@Gh;iO(#tpMXCQlHQVRvT8VaR95oBWnHa&m*5z~m>EVw}kkF^1I1g09+=KL{yJ zJ|H2WnG90Lkj9Y7kj|jRpuhlE#h}5U3Fd?3iy2BLE6R(q<}su)lur&65$DwasxD#3 z0O~7d(46cquR3`HKg;HMA`SwRcd&^}?(*Q79KfqIc>~Xp$!9cFCin4Xpoz;(HV_t= zY~d+0xr@&UtR_#r1GgHDH@M_Bb7|Eu;*^xq$ztS$1_#jV8`-4cZd)KMg%&XR9_nCM zlN&IOdXkeLXmD|(294w97TqSs$!>aLlNI!>%(JC0v5CV*DB_Qd;5DcUt5xP!RY%(8@(&RfzT$|U~ HOcDVA1xTi@ delta 114 zcmbQYn(@FQ#tpMXCU4+pncQH;wb@3@Oki^s4;SNPA1#&5eY|#H#^i4r9h1)pU737A zLv3<_R@>$a0)C8>ZFCN8J|hHXSWT|eE8E;<(8M^|O{`<`1S6i!bCh&{L+Z=58c#;`F*gR&ow5sBsc0}6atGkGJaI2?-H}nWEd;hpz z^IPRwQn5SOXYdpha0`1|-F2`QsS^|| zz?Hl6@XA&r6+tei=sXZwoHE+n=H!;=e*nVG$qsjNaMBAf|1>Y|kkMGj3*iqO?Dw`z zRZ}Y|+$m29sV(xH|0A1`3q0H472nVll3PNuE5*q2+ktNPXT;R_i7yzFI@Dw)Rjdk) z8tyko(Kdr zUXUJMMD?UW(u#rLNy)9u&aJ%ESGA711>Y><&ni|KoJo^f;AO)q6&IF{ide#1a0)-M z*g%m{*yKBXe7U9Foe9?0@iX6j-}aE<5q*=NhcBTzeeqEQkP##b$zTN+8&K5l{<=G>W&-v*{LfsX?~K36D2)?Z0V7CFPOjc7>X?24quadW5@ MJ!N>+l*91;3oP$YS^xk5 delta 179 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 delta 369 zcmZ2*k?~db20Ql673?vrlWT+?O^)M{o4ikrXR<&F%j7q_B9rw*ye4nsKeD+-=mFzo z174QNw~V+pi5=nMFJj1NC}ButNCuNBlNs%8vkMq185Dpb`3!js#X#{QhElM6K9Hrr zkO>r1U?>2xGa1Sl62bZu7;G49fubP{8BqCTh8&<=F<31`M;_QbU9hD)@XB`y$93giZBf!0M^-EhyVZp diff --git a/EAPMethods/include/TTLS_UI.h b/EAPMethods/include/TTLS_UI.h index bd70f3c27a4d52c6fb7e2a1731793039c6107b6d..1319f182f0c572ceecaf7a7b300b26b537f4321b 100644 GIT binary patch delta 698 zcma)(O-mb56oyZdagji4%+C`OM1A>SeP0|mH4wEURf^Gjm zq3~`>anXevH?1&#pdZj>YoY6|x^>fE;Cn|~L=d`|IWywOGyOJ5CSQ`+I8{i-v3-Fr8UZ`vAJmJQjKEvbu=M~s0q#AmF@CVn{AFqzH3&i=ty z-QTy&n&~{7z=!KjsB%*s6pG`}?qO^iQ5>bJ-HMGh%GK~mrcYPPX|bjV*%XC7E1fnhBID**urCmwEC5 z9-ugYvUxYK6p$P01 Z>&cF4k|3GQJqBTn9JLJA47?0n3;>6JM-~78 diff --git a/EAPMethods/res/wxEAP_UI.cpp b/EAPMethods/res/wxEAP_UI.cpp index ffd1c33..f84504e 100644 --- a/EAPMethods/res/wxEAP_UI.cpp +++ b/EAPMethods/res/wxEAP_UI.cpp @@ -15,16 +15,16 @@ wxEAPConfigDialogBase::wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id, c { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - wxBoxSizer* sz_content; - sz_content = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); m_banner = new wxEAPBannerPanel( this ); - sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - sz_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); m_buttons = new wxStdDialogButtonSizer(); m_buttonsOK = new wxButton( this, wxID_OK ); @@ -33,12 +33,12 @@ wxEAPConfigDialogBase::wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id, c m_buttons->AddButton( m_buttonsCancel ); m_buttons->Realize(); - sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - this->SetSizer( sz_content ); + this->SetSizer( sb_content ); this->Layout(); - sz_content->Fit( this ); + sb_content->Fit( this ); // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); @@ -55,17 +55,17 @@ wxEAPCredentialsDialogBase::wxEAPCredentialsDialogBase( wxWindow* parent, wxWind { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - wxBoxSizer* sz_content; - sz_content = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); m_banner = new wxEAPBannerPanel( this ); - sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); m_panels = new wxBoxSizer( wxVERTICAL ); - sz_content->Add( m_panels, 1, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_panels, 1, wxEXPAND|wxALL, 5 ); m_buttons = new wxStdDialogButtonSizer(); m_buttonsOK = new wxButton( this, wxID_OK ); @@ -74,16 +74,22 @@ wxEAPCredentialsDialogBase::wxEAPCredentialsDialogBase( wxWindow* parent, wxWind m_buttons->AddButton( m_buttonsCancel ); m_buttons->Realize(); - sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - this->SetSizer( sz_content ); + this->SetSizer( sb_content ); this->Layout(); - sz_content->Fit( this ); + sb_content->Fit( this ); + + // Connect Events + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsDialogBase::OnInitDialog ) ); } wxEAPCredentialsDialogBase::~wxEAPCredentialsDialogBase() { + // Disconnect Events + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsDialogBase::OnInitDialog ) ); + } wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) @@ -96,7 +102,7 @@ wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, con m_title = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); m_title->Wrap( -1 ); - m_title->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); + m_title->SetFont( wxFont( 18, 70, 90, 90, false, wxEmptyString ) ); m_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); sc_content->Add( m_title, 0, wxALL|wxEXPAND, 5 ); @@ -217,7 +223,7 @@ wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent sb_credentials_tbl->Add( m_identity_label, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); + m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAIN\\User, etc.)") ); sb_credentials_tbl->Add( m_identity, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/EAPMethods/res/wxEAP_UI.fbp b/EAPMethods/res/wxEAP_UI.fbp index 8dcd5e4..9a233b0 100644 --- a/EAPMethods/res/wxEAP_UI.fbp +++ b/EAPMethods/res/wxEAP_UI.fbp @@ -90,7 +90,7 @@ - sz_content + sb_content wxVERTICAL none @@ -331,7 +331,7 @@ - + OnInitDialog @@ -354,7 +354,7 @@ - sz_content + sb_content wxVERTICAL none @@ -566,7 +566,7 @@ 1 wxSYS_COLOUR_HIGHLIGHTTEXT 1 - ,90,90,14,70,0 + ,90,90,18,70,0 0 0 wxID_ANY @@ -1644,7 +1644,7 @@ 0 - Enter your user name here (user@domain.org, DOMAINUser, etc.) + Enter your user name here (user@domain.org, DOMAIN\User, etc.) wxFILTER_NONE wxDefaultValidator diff --git a/EAPMethods/res/wxEAP_UI.h b/EAPMethods/res/wxEAP_UI.h index d3427a8..1d5f127 100644 --- a/EAPMethods/res/wxEAP_UI.h +++ b/EAPMethods/res/wxEAP_UI.h @@ -71,6 +71,10 @@ class wxEAPCredentialsDialogBase : public wxDialog wxStdDialogButtonSizer* m_buttons; wxButton* m_buttonsOK; wxButton* m_buttonsCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + public: diff --git a/EAPMethods/res/wxTLS_UI.cpp b/EAPMethods/res/wxTLS_UI.cpp index 3a8fe16..04ac84e 100644 --- a/EAPMethods/res/wxTLS_UI.cpp +++ b/EAPMethods/res/wxTLS_UI.cpp @@ -11,7 +11,7 @@ /////////////////////////////////////////////////////////////////////////// -wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +wxEAPTLSServerTrustConfigPanelBase::wxEAPTLSServerTrustConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_server_trust; sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL ); @@ -96,21 +96,21 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i this->Layout(); // Connect Events - m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this ); - m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); - m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this ); - m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); - m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCA ), NULL, this ); + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this ); + m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this ); } -wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() +wxEAPTLSServerTrustConfigPanelBase::~wxEAPTLSServerTrustConfigPanelBase() { // Disconnect Events - m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this ); - m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); - m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this ); - m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); - m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCA ), NULL, this ); + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this ); + m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this ); } diff --git a/EAPMethods/res/wxTLS_UI.fbp b/EAPMethods/res/wxTLS_UI.fbp index 80959a4..e2baaaf 100644 --- a/EAPMethods/res/wxTLS_UI.fbp +++ b/EAPMethods/res/wxTLS_UI.fbp @@ -40,7 +40,7 @@ wxID_ANY - wxEAPTLSConfigPanelBase + wxEAPTLSServerTrustConfigPanelBase 500,-1 diff --git a/EAPMethods/res/wxTLS_UI.h b/EAPMethods/res/wxTLS_UI.h index 9d722c9..8a98e75 100644 --- a/EAPMethods/res/wxTLS_UI.h +++ b/EAPMethods/res/wxTLS_UI.h @@ -34,9 +34,9 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPTLSConfigPanelBase +/// Class wxEAPTLSServerTrustConfigPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPTLSConfigPanelBase : public wxPanel +class wxEAPTLSServerTrustConfigPanelBase : public wxPanel { private: @@ -62,8 +62,8 @@ class wxEAPTLSConfigPanelBase : public wxPanel public: - wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPTLSConfigPanelBase(); + wxEAPTLSServerTrustConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPTLSServerTrustConfigPanelBase(); }; diff --git a/EAPMethods/src/EAP.cpp b/EAPMethods/src/EAP.cpp index f9f0b5cf331cd56bb3bbdb9efab123326456b459..fa367377887125d8594f5ed4204ba9885dc2b0e5 100644 GIT binary patch delta 289 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 diff --git a/EAPMethods/src/EAP_UI.cpp b/EAPMethods/src/EAP_UI.cpp index 14e1893c867fc1c0b6fa6fb0c1af75cf521cfcdc..9a099c86bfed842cdbb314183405784e1cbd4430 100644 GIT binary patch delta 471 zcmexo)L_2h8TaHzoL0{M40#NmK%B`?!r%fV6B%+C@)^<@G#JVmDzM79GL$i-0(F!y zs4*x2S!I(i@=B+t0d*At`4D}zg*(^?m%7%gEK=0SZ4}QHOM_044Mpj z3=latpiB|iK9Hz2P$$9^R36Yw6j@ycJE$3cKvOG#_GnCgC@fiz(2r2z0(NC0*k*)i zIMD7qh7_Rd%h6;IA?E@1Qwq>eAisj#2+|(_Wak4zCl%=OVg`h24Te+>SfEdKKpDxwD{dES zVFw>`)wU*qN2lBBJwO4PK}-fKP9}0|`7CW5%6Yk^wyJd!9wr&ohDy!Ug}(un;T$~W zWn5)26xJ@;oz2uvKAMV;>Ba^pWhxonQ!3$VR<0HcHo?%pp@sDLU ze+juboNJ8x!JyPMX-r|zaX0YaJQ$dRW}50c0p{s*Em#cr#ROZPT}u_I5P+}f*%pz8UR~mjMW+|X57~N9wCZ8eR%j9qhxgxXT5*;I2$Lnt$9ErLZ7Cyb|Q}@lFjTcthhCCq416=)d8Ck+O+w)zEz!v!#bQb_} zp;6FJW1m5ncVKBN^rpDj4B9!8bD^T07i+5BG4v!|#StMQX9b}elMX($>Q_j#@V?Rx z`h&F8LwDJGra=wlE$O=Vzh#^~$$<==r|S=8dCM4)>zep(dU(9`*Me!r?&;L_eCKLeJ& eIxrhRm&TN&poR$stnPEs1W$au^m5{ZIr1CDe`VVM delta 124 zcmca}ljX`mmJNr_Ph)4anEYvvn0P!x1w$@F4nsUc2}3@ROaij=8ImR!I(SdMbwzG+ z!2!O>4;+Q2FX3PmnEVaI*(EahfCJm)jMGAsqZ}0`yWEwVEOiL1XmZP4jmdH*eA6#T ZFse)z__%Jez%ql$cRosN-f&OH4*=_0GOhps diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp index a97cbadadb7f9db1091f02c819d1abe8ed42c924..b9c1920ff3518002a11da09840877c430224459f 100644 GIT binary patch delta 18 acmZ4WjA_?1rVUlylk4maHqYvwpbh|9uL$`7 delta 18 acmdn>jA_*~rVUlylapNKHm~TOqz(XC`3T_v diff --git a/EAPMethods/src/PAP.cpp b/EAPMethods/src/PAP.cpp index 8ead041624067f2136f7a9bf674724db4be32f9a..166530f4a95a27864c29bdb949a535e942a32631 100644 GIT binary patch delta 529 zcmX>ju}^J-56@&JwpGGK45!yeF_Bw(as!7DR=H5lV65UB pIVG`*t8%MP{>6#iEK#mZta{qHim{60w!;{!`b6$*tm0R>%K>Dcdk_Es delta 7 Ocmdm|c1B`@4-WthEdtR1 diff --git a/EAPMethods/src/PAP_UI.cpp b/EAPMethods/src/PAP_UI.cpp new file mode 100644 index 0000000..e09cfc6 --- /dev/null +++ b/EAPMethods/src/PAP_UI.cpp @@ -0,0 +1,68 @@ +/* + Copyright 2015-2016 Amebis + Copyright 2016 GÉANT + + This file is part of GÉANTLink. + + GÉANTLink is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + GÉANTLink is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GÉANTLink. If not, see . +*/ + +#include + + +////////////////////////////////////////////////////////////////////// +// wxPAPConfigPanel +////////////////////////////////////////////////////////////////////// + +wxPAPConfigPanel::wxPAPConfigPanel(eap::config_pap &cfg, LPCTSTR pszCredTarget, wxWindow* parent) : wxPanel(parent) +{ + wxBoxSizer* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); + + if (cfg.m_allow_save) { + m_credentials = new wxPAPCredentialsConfigPanel(cfg, pszCredTarget, this); + sb_content->Add(m_credentials, 0, wxALL|wxEXPAND, 5); + + m_label = NULL; + } else { + m_credentials = NULL; + + m_label = new wxStaticText(this, wxID_ANY, _("This method requires no additional settings."), wxDefaultPosition, wxDefaultSize, 0); + m_label->Wrap(-1); + sb_content->Add(m_label, 0, wxALL|wxEXPAND, 5); + } + + sb_content->Add(10, 10, 1, wxEXPAND, 5); + + this->SetSizer(sb_content); + this->Layout(); + + // Connect Events + this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxPAPConfigPanel::OnInitDialog)); +} + + +wxPAPConfigPanel::~wxPAPConfigPanel() +{ + // Disconnect Events + this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxPAPConfigPanel::OnInitDialog)); +} + + +void wxPAPConfigPanel::OnInitDialog(wxInitDialogEvent& event) +{ + // Forward the event to child panels. + if (m_credentials) + m_credentials->GetEventHandler()->ProcessEvent(event); +} diff --git a/EAPMethods/src/TLS.cpp b/EAPMethods/src/TLS.cpp index 32a00a62b4d00f62eac092f27ecfc174cae9215c..300d78761b215ce656d5983ce8ce58e718f50310 100644 GIT binary patch delta 310 zcmX?cgz?@!#tjBelX*O3Haj_aaOs9J_%Q@AxH7l_F^KkKa0Zet4Dk#B430n%M+RRY zKLjkRFR&t#bZqseJLB9m7M3vF%)c*SU1!cfdm!cfGJ$&km8&Y%EfCjxot z45>ht1`018s3MUe7bv4KnK4$HQFF4rmFVQGAeYHu!F7`#1kc&r5#qoojckA(Lo(1k z5DPRIG$%g{Rh=9l&bFB^OoUS$Ss|L)f|?9yS~pwApJbeDqscK@E>Q+(wIi?OWR64! j)>MWZhT_Q!L&YbvB#KNn&=8y4puscQ%3W-7T;d}Ds&P#3 delta 344 zcmcb&kMYD2#tjBelNES`COfb%+5Ew23FqW9ehHJSwA3c=FcX+ONkxRQcyfHS_~Z-X z8k04&#U>YMYDwxd=rg!7Br+5*crfHM6f=}CgaXM_hN8(6RYaMK8T3IkP~SllVP;o` z94K$P$W&zo23rONpxz)L^atX220tJj0;Ju5bSRMLGI^qOx;DtP93V~xnw`mz$B+)x zWrN#J)?x-b1{tDCbLB8O`aktG}$OB z3g}_J$=CerxD|kwK;h)we)5xx0_rBuk>uI@A;5ug@*+PeMxDum`l_1?f}}Vni$qCn dJ{Nt05vWLH@{?GD$u(XQlk4IhOkU^30RWo(WO4ui diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp index 0ca4260c3c574074c3a92f07d78f26941d1e40f0..0c3f7265eb2703e3468d0515a493adc0fb35cf3f 100644 GIT binary patch delta 1945 zcmb_dO-vI}5S|56Yk_uYx3nPbwx&QUzhX?37Ev)UtvEkwl z54l~$pY3%jIY^@Or-}$gXQ>o$MRRunUab*StflO_uUd4t1nHZhki)nyVDW$h>gk<^ zYg^p|H;#u(=T1P3PWxdDX5>B}BE1A$gkcDgWRm(FkykI|gN|gWCzFN)8c52RF-<%3 zwG-Q&J|BWs=z{_1gk}viK{q(i`PhszCgTH>E?0qroYPdEky*+-DAG$Xg0UK#EmK@o z&`3_g5XLV?v7(Y>9%YHR;pw~V!_NWv)bC;_bEtZPXHuiV>N zg+F>N7NveS)$%&kbqbPr|E>k?MVh&0nSqQ^A;NMHYuH`HIGNbSMkUU68+W?1L&UaW z;#+`T_SHf=>-}kH-{e9kA&(Ju3$3inv0@lexa^?ANup7dLWtvn;6dJ|HUD8mHXi&i zZNc}69J(0GxLJI`d+?S^kW*sdiS%ggEwN0Ndrq%RncqL9w^DMfDpT^QkTOV+6RTJW zn%k(Waq3Hu)-ZLIbuU7DWV5^MEJi0GnNLw!>xx`{`s+~ns&T?3(pAyKh}KSqNwq%F v0C{9O_K>p}0Y=C?v89bmE;Hu!X_3Yp{f#-CJZiXc>L45B|AVi&DUjz702f}RrwBUxk^E*=#r%32YgA%Ajwn^UHq%cUUj?rZS|X~H~cJBZ>p2(ygIE8s@K(i zHPG`vR`;tvRDZ7S4DY_svj^2twOehg)!Bso>Gin!w|cHso1srS@22KrtX{RJ>!HT( z4ZojMTY?5S-srb1 z>{wUY?gTgn0VCV`bufeth-kG_-BYhqeLK>X)_WR<`34zg-iEfjq2)lUWrd7&s(!57 zR_DJw7M7mt>0`Ax4z0F?m0q1AQ*cUt9un%oasOCFw)6Io3k*_j-G7`rWD^k z&m+xm_;?l|i1_GLkMzW#-V&q-`gUCXUSsWswXp(L{VrV3hQIf!Kj~S%mK;h(0ADFI z3xXVc8vYp-F7!EX={uMPtB0XwY36CTphQ!!1V2F)qt1SS!sxU=gb=Fs#53?H^w`$w zd%_a<-_!LlV959+UEzyrMO^<~wJxe|ss~c=Qr8!{d#aB~#mnkTJ!5oW0Q=0g8*rRL zb|9WP(Od`m4Y-YmPXm?)0Z&jMo&QPoP_rxv0-NbU^{pUU4Nw7xaqy$?eNAnj=>rF> zs~6D1c|f|U7E4;gYWT*}=X$!KcF)x7uG;l*>R$DudhDxTY<;59w>19I1)h#{k7gQF3t`Uf0PT(HiEw_P z{_y5@b)&j9oNw|G(1t&1^uy|l#yCKPtN}gPJQh5_aVETM1x*OeS;v=Q-f?ZA#&Ooe z*9?xY%LkZ%1x>IOIAAgG>al2rmF{cB1L4ao@pXY3I2@bf;9eA0BYn*kEogNsdfwOS z&Ay^z;nzP{S~CV^(HIKH#lnu6qAF(go-W z=(DSF43^%Mc#ZIxPPlB`8lRZWgj?FNdRcg#jGs&&!Qt>P_Gcl%^{t_XG;BC$MqJft z(W}1J+VBnGXw!1j^XI=>umf!)-#avTwD3>PRo2qm_!Vn{e43Y>_m~CRo0@qNiNkW^ z72-!?3%|bL_t~Va9Sg{eMJk^KTGY8Ir=;VhE`28BH-+!pK?-d|Xd7v7`0^3_+C~lY zibmt!$M9=TALFe!f0Os-t4H$nMy_^f@%;v}|EJPJy##Mp%~!K(nycce5?77WLOJdo z;~$UL%J7Wh&8A-TRdnN|WyNSjLCX_rqBH3r)AG@CS*iXe&v;d1tn0cg8Gj`{b`Kg} zJ{dkGI&SN?rhewF(|$?c++TXCdvIgD*ERM)qx2M!Jy2}c53%3VVJvq$%yyz@_>vDL zO{eO68mxNsPnx_Meg5Xf?ttG2+t}u`KtKeOlr}!Y? z4S$QchRjOLdprs76HV?6BO@ONyr4(l2p4}>9F^1hVX%fy>2EaqiFkqNhF|b(r<*%p zvCHRzpvu>4y4)j$o}=A+ zq>c7Ekp}&y;19Rcx{I#4CwS2O$D#q++_hA@Msh6qI-7h_)(+&2u^Ty6`m$zZu-@u< zT}O1$WY9U6^l_`4Os?}W!PiFMtFH3uSp8+m?Kqrcv2uQxTuL2d(@3lLX-cjC(oL4` zDyL{W1wNi%$4N^bE0Gh4o?dP_yGljLE=o0!Og5zr`%6Jrn!Zl`;xbmvRzz-Nt*IYr{!M#+ zl3&P-;g_bl%G?W_x91MjxtGCCAhcuW6s_I#H0riBU3J-_rhH&hxH??9?VOn>%U%k0 zr0hrMc{yVF=wp*(n$45ARg-CW=2P*>p%PxutAg!?a&7#a+qrr8;s5uLXZ4U%ntqx- zvdQSO@zqTql!scB0A3np~UrntQFbuh0JLBtC9k%7L-2wbJodF06}NK$n^5 zd8Y02xPi(T_X$k8VjTTC;ANbr+|>_oXvam`P0YHdd^6+)(lvq;;*_sL?mD&5dE82T ze6wizu?_VR<9L>D+Ei`BhOB#EEuTq)QFX9U{h<1xeAghiSxzP6y|m{$^-Qf#-f~mk z1erA|cphlQ@Ke1v`@(O79VFK^sM!l2FZVoB?2PkYe1z0*V#ghMvE7sF%|qkjfXGqK zl_?K&<0vc~^(@qR?TTNl){4x+L*)nI{&n%t16|>$HQiCoLY8z*JVjN?ivCkoX1N1= z%O~M?DmVD{F!ZNFC5<}M6|_C4l7W2SYeBUySS&+DX44}}dfrieoXu_fa`pTBiOel& zg`0wjtnBylhFRC-Qem@}WFhzXJ`4U&)YWxw&-pcvYRqp(yT8|}+I(Njf!Kavnx$%+ z!zG|C50S$_WEDN?ZrM`kQ1*S{*zvi$5}qA%xvnUC%-%ND3RjsAoF)zfSM$joK9~ID z+SjVqB6p698IHt@UaK&9{$V-_LF<&>d2b>L-)*7ZhFXz4_G|al%N$sWJh6P&)Hb*A zCcLo|blla~Eww@BRWrG7GP*UCDOCr>UG^@r5IM(fy?Z;e*9o<)2fCDMJ0i`^rleM^ z4pr`J;RT_cuBK|Jw61P4Z|n6nM%ncz%s5NMPzlm#}N7D2&x(oP2un7v9z$g$#DtgbIgx+QPp z)xr@r8#ziRV{B{HZ=`po)#OwQ@Mh3?Shepaz=cg|$fbWgKI&tW0V8)=kEMInKlPy= zJ*~24-T4R}59ccf&NOQ|9o1uG9PQV2+iN19Z9IkIpi$olk-XI#Zt2M!DrP6eaCCEJv^@s zCHvWzT+E|#I$hP|R$z8pm*Qgdip!bF>ud3*m$#3H3)d03Je2A0ZJU}V?|oI$WV3Px zguQ$IF=PszlKVYZEk{i({Mx1IV`IeSB$tY-l&R~oI|Cd@NPUL}UyI5=JFO$;ti0`Y zfggDIi&nl3axxWdzr}Zv^A>qVBx=>`h=n=@shFZ}^HZW-6K1H^d>ZNHzm1|)s_!G8 zc+ZF*<|3}()RY7HcAP!&K{&)}&Fay?DY^9_Vxp4dk^Z>yz6|xt{ZI+Q2`*HnP}BTW zGnYLp^LZKDHJMSLYNeIxcj9x-KVq$xwWfB?qI^z!v06N;Gmvn8p~m)=-V3r5O?;n* zT^mjk;go?R;lj^x0!L&Ud5@^42yjLJft2_EEUV@x+3;rHUht=F1k)%Mxf!hW-6UJb z`|xfwaB3Ygxae6S^Qy;Y^c@ga1HdgdSvRt7=ac0`A=ZV-t~cV!18G)O7Nx@XR_F6=e0^R zgKj0jy{qab=ts<9`no4tk%u;T{X8t96~~gVgZlQVB!2Ki@b=T;;t7|wY(hF8_dG| z#%-_Fn>Rp>-#A&uIi2&Sj63qTG~DyI^JTu*{LtxKkfhS`OnvR`Mr5D2+cqSPR0r}- z9`7Ig5abhSv-jK{2RWc7(jq|m+z@qaRI9AqRL@mOC^c{~Hlq5BxRUxUe&r77?}yyV zU-j#{-W*<2k5t}W?rj~<0|oLm%nx$YKA&rC@CFzKvJ|@9ueywAqpYntmkF-l5$C)Y zG}l#AJGHI~FJ4#7evruwHjTZGlu9wb;qZ02rdHO+!J~c@w90F7XntzW)y!^t2-rH_ zi!klD9AtY-vS#+Z3>Ws&v`AlgV%I(E8J={6+3(w^ zWE$jD8V-ivQOh(@^{o+mWsYfO4p2lk*#e3EPU`tIy>vCiZ=);ti$^>nlN zzHM3ec3(lA|6CrrjeOFOwr=B1uH(ARQ_@#mM;xzvy3WwVwrQ{KD@q=zRkE1tch#ObG603Y$=m4UzlUYXdFI)+5G;d1xzFH%kXn^&0M!;(|Mt2 z`lwC2jWwMH>^2v0mo6vb$0(D*LE(_lJxZNO~RQ|fo;&}e0dW`=AG(5QU delta 91 zcmbPql5tn!h62vbXSjrzCf67XO}@vawmFYqNoI0`Da&Lj_63uB+$1)?a&=iq)uk^muIVG;AP-q004*b8V~>g diff --git a/EAPMethods/src/TTLS_UI.cpp b/EAPMethods/src/TTLS_UI.cpp index d0e7c8c6c40ad749ed1d1bfa25f70daa7bfa4f55..ddec7281fa93eb09c46f2d0932a99a8488535627 100644 GIT binary patch delta 1690 zcmc&!&ref95S|L5v{I;)ilr1@3ql{ZrBF};A`%oNDZd0HczJ1Q5h7ZkHKImLJgY(H zX#5up+PjGt4j6+N4<0ohJQ$-S#)Aj-+kJ&v0~asmW!v4I+4=F!H}m$!n>&Wp??zLc zA~a9!)Xwj1c0-as8mrUR!Ut|OOvBVeV>F6&mJ}!@={jx}DNZrmMXhBjXCCHD`~5Znw< zH--6=uZw3qRzB}HbJ$nx5-u;mT>@qcvqTy*|SNd0wb1=XZgk z`fc)v-1kI{eEd1&w5t*!4Mg+6wy2+n)Saratb;vWarEgvaO`EVweaIAPe~F!W?^lLW)PE?zl0o4 zkwxF`S+G`JUacb;mpQcWlFydeULV7Ik-vyjkz?e~k&;DRAZM*DD&M(*wy0i)XS`{2 zpa=D#B!*FLbvE}qOi?+|B6N|Pj@U|s-)ZQJah1YM+%h}<4cC$!Tm?JZ?0mAg2%gKlClBj^Mm5NQZ9M6u?ugab|fgL+aX3aj8I zLq`FHXqQ{rg7lzF;&n_WEl8!J@OrU&Az73@#jPM()>7_Chd3+E+8+dbONdNZP{~4O gSW);_jfIB~<~wDRP*(etj5;E;dE@v*!A<$%H*)`O%m4rY delta 393 zcmcc8!+4{5!#DQHDjWivwK(P|PX3}9GPy_nXD()_nmkcock%@tuE_x=Qj=fkYfV0&%QIO)zW}IpqW8O`f7CGTBX4V)6tf z9#N>d3