From 0c83ae04694ff7f973bc4dde4588665ba3e1c397 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Mon, 29 Jun 2015 22:25:43 +0300
Subject: [PATCH] tests: EAP-TLS with PKCS12 that includes additional
 certificates

Signed-off-by: Jouni Malinen <j@w1.fi>
---
 tests/hwsim/auth_serv/user2.pkcs12 | Bin 0 -> 2414 bytes
 tests/hwsim/test_ap_eap.py         |  10 ++++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 tests/hwsim/auth_serv/user2.pkcs12

diff --git a/tests/hwsim/auth_serv/user2.pkcs12 b/tests/hwsim/auth_serv/user2.pkcs12
new file mode 100644
index 0000000000000000000000000000000000000000..0970062387f82e291b5a65cb92a319a73701dba5
GIT binary patch
literal 2414
zcmY+Fc{Ce{7RDoj#1do(Ek!4>lp>ZAQmwt2n%3Tuu~wrVYKbU~Dq^ptwo<8)Xi;ry
zZL~^CEw$E8trK(-DN1YKis_v5-kbOSxaXep{m#9Aedqg7WQZ@2hZjYLp!gxG3D|^f
z5gq{^8X0mDM24LBAs<7L`HucU{4_G(w;$3MAP?Zj;`~E+P_q1j|NbD%!;gZ3z!qMW
zDFKTT-+(|cAeziqXZ>(nkNzU3I9~AM3&(Cv*M5AqC}3pe?FQ?H^l}4~vaS7OP6oY-
z7roR<H8c;9W@ha(1u7}XPEzfW>>pk1j%Ym@>RH}%W8nz<xVTP_>+aU18al}1HaaI1
zw<z!Y{_q_JmNpPbPJI_;+L%29^p+Ks<o?O-14uwk46)N40fhTg6;j-%!lUGf6F|R(
zdSsAkci{|XCh3(J^V`{_*7V2FG1Zs_WvvJs+0CK5N#6DAb;}>hpH1><XlKSA3zbsQ
zut?3_ACC|&XLWv_g|_ZS>gxKizY?4|vgy7iVaa$|YnIz7=M9wx7E!JzgsBHv;~u31
zMH2{nx1TXWpIKo#YKZAuA%PiR(A=UXIUQ18`JAtPT~f{IUVN~X7te_Vcd^NGo-H+X
zrJ-(kXRXP~$kn=Nhk#YNv@G!lmRm{)md@}@lS|?`#aAt7*rimz&t*k?$5oS*L)Z-J
zTn;$G)k<mKH!CZ@!1iX8Scii<rN>P<ML?T&!--N=Dd^UtdS0)3uFT7p{5*oM!=kYx
z8+4}HI*W*}G!l?Z@z#lpb)hupx#BdVs~S)9&qmN{_8oQTjjVe$+`4jMyU5(`6=$Dy
zoF1FnW_bcPSW4$29W;HBiTU5qHB;E1hA-w41=~TJe`*?M+hkvB0;if;$xhbk&LD<D
zf6*{oZwoFG6>auB<>;+o<Hf8{e;FEV=tb?!4_%*cX4q0S6p?o;K0)34+b`E9Ksobu
z;S(T+@*JUTst7<@IgT>2#&5+A`p+@ZHsSJ)2%63ZKflXqxh6Evsj`a-Rby#Urw-0z
z+-_b4B+Y8N-j*{(zBc478yZ_W1u$1HSAE*CyQKJm@OgCk%^e9_yEcPGA$E$z_kC&8
znu7`2w)O28C%*f8k*i=aP~%=Rx5Ve}X!@+Qd9nVeW`9`ATO)gI@AoUx9ickO`Qk2t
zap1>4Lz9Hk!*Y8WC(R8s0t#n64&gazt~hbWjfLU`mC<w8IS#5-ZnUXXb!G9$OOG2m
z&3fQvpRHVy4M*wuLL$>_wrQrPpTdSo8hKA)E&F0zqYz{2sl(|f`{YA;lZ@I4CH;)}
z#r8Ey|0_%5fMI^sbD-cBrkB{Bj5`VMPrPEgyAHDND#Ywoku$gQNjO+yw(HS#@08#>
z;%$HU#}OKwau%`9a_PMqe)M<$l4rx+zLxF`n&Nigmloz#xvWfpq3-UDfk%qrA@GrY
ztnX~V6lnqsdMX%M3nA1DUK_8^i>b`2kd*bDxEKbFx}y!ZywJ70!MVkjT(%7lwEyTb
zP#FMR=cII7PTsKp+TTEUrADvk<b%9vZ}mAM^T5$4oiKRQyp%E)X7|v!%;Ms}Nbb>0
zg0aWeJYH9iN_u|HKs1k<I7V*2<!u{S(om~3k%}DqUbL)dJ7kHJ(-8QiTn&r$xP3VO
z2-9VF=t6I(-9@a$i!fCcot|?88!vxVp#-s8{D;%e4kGA6eK(stL5v)|@~#nwHTC6i
zX(C0TWdW9=pv7J?$lRE*YybxSLP|3Eh!^Q)vAz?fWNyh7R^V+s73lBL5TSW>edvjH
zcNn$EUQ0enehZNw!A?w*p;jf@q}yIVbG=Qj#IUxd?U97%tj9`%BWkeP^-xxQavzo^
zLa(0oYtgGrbp6wb=?E)8M48ViFLYZt4%5Y!(n6h_!uj$Nq`T}e9x+n}l%=!GdIsOm
z{*xioxBV;rD4b`Ihati;GG39A`41!0a)GA-n-2q-Z&f~2+lX2pP@{AO--dNl!`-Et
zvC}VKIvs?i30W29NYG@{FPkk+@~x<uvn^Mr4ZelExbJ^?XW$7Z*$c0O;-IIi!N0>^
ztAN^od0FsY#(4g^qP`8MYQ<^Dpal|)Wft6YW9IVv#3`NWex2zOF?mgFt#`y^by74$
zjP2;e&$GU^6O1DB!u}`dX=Gkr5E*!cA_Mn-%r?K!e_~&d2S_6WOMi%u|E~>r|84{K
z!?`D@l1<gW+u+A}w2_Te5NQA=)2gDxfJ2L@F<b3pl}=cdwF$`OPf-~f%LEA}T;PY#
zb6)XV0QmVwhQE0j+$!eZJ(g0MK3JHHBYy3%O#S&IC$94zqZ*rWVc(AZ@*A#Fc6`?v
zbcVv}Z@q8dI&n!|ZZ@G$;(15Qb+*r{fTMPwoDix~Km%MIe&1|1c+f3x{P3qU^VLW1
z5-cmWRo=je4BxPN6n43-szj<e7hpVN_WWY}A?OXQWw%GVWJO%<8cN3Stb4#@@llgQ
zG7GVuLXBFySI}27)n#&A{$4&pV-~;FV{pLjK0-GMI{F&|f;Jk4Gm^hZ{2u&t%2?*4
z%kK{19NEM3(dlT?R=s$Tx+E<u7MpiTDAu8GE5>oUk5tKF<R)A=AX{ijyTL0fz*y!m
zEg_$-+u?`6bS&>S!H|^qmO4P;uFv1=k1{riSwV9c=Z#D4#tvWo+>yRME_KtwRW);y
z$^BPX74OyI392&9B$iP(iBMY0g&uG_+ejsmz0GFmQ1d_&FfPM8N-^`nfPPi2Pehl1
z9e5hil+xQ?xOS?<>DeLAs+4`L(E{*MztPA8<@1HeyB|ICy6@mZ3McAI%OtX2Uhz(?
zI!?!Vq2s@N($8r|x)vNWTOz6(f7#D-gYW(J@VNH*XQ_IncNH2N$L!W`0pF)Srs~IW
z<`_-%tLRs2S&GhuFEF=w2?g$^kcM9)=nM7|DLqHXJ%}}?V3LwadBEJcp!+tyctG!=
zW?Jh(H-5-%6WiL@>fby2()-cwZ^C=_nKP`3=?fqGKiFumQboR$7qila>RO=yZ4LEl
z!Li|O7^zC@^cxJuZ*9EiX$zn!(~`8Nrtz!RIh53YT@8`Y5|jf28~}Jg2!Mz}`~xJl
z;2?<zD>rp~c~PG0jR&^kdhY!Di|;m3TBwsK2tS`1loxoM4*-%d?<r}IS0&c%0KKyB
Z?6lUl>ulcufknQ@ikw>9PyO5We*xlVgKYo+

literal 0
HcmV?d00001

diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
index f6c8d26e6..ceb61787b 100644
--- a/tests/hwsim/test_ap_eap.py
+++ b/tests/hwsim/test_ap_eap.py
@@ -1293,6 +1293,8 @@ def test_ap_wpa2_eap_tls_pkcs12(dev, apdev):
                 private_key="auth_serv/user.pkcs12",
                 private_key_passwd="whatever")
     dev[0].request("REMOVE_NETWORK all")
+    dev[0].wait_disconnected()
+
     dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TLS",
                    identity="tls user",
                    ca_cert="auth_serv/ca.pem",
@@ -1304,6 +1306,14 @@ def test_ap_wpa2_eap_tls_pkcs12(dev, apdev):
     id = ev.split(':')[0].split('-')[-1]
     dev[0].request("CTRL-RSP-PASSPHRASE-" + id + ":whatever")
     dev[0].wait_connected(timeout=10)
+    dev[0].request("REMOVE_NETWORK all")
+    dev[0].wait_disconnected()
+
+    eap_connect(dev[0], apdev[0], "TLS", "tls user", ca_cert="auth_serv/ca.pem",
+                private_key="auth_serv/user2.pkcs12",
+                private_key_passwd="whatever")
+    dev[0].request("REMOVE_NETWORK all")
+    dev[0].wait_disconnected()
 
 def test_ap_wpa2_eap_tls_pkcs12_blob(dev, apdev):
     """WPA2-Enterprise connection using EAP-TLS and PKCS#12 from configuration blob"""