From 31dd31538268406084cf04c1fbdefbc37301e45c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Sat, 6 Feb 2016 01:09:42 +0200
Subject: [PATCH] tests: PKCS#12 with extra certs on the server

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---
 tests/hwsim/auth_serv/server-extra.pkcs12 | Bin 0 -> 2426 bytes
 tests/hwsim/test_ap_eap.py                |  13 +++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 tests/hwsim/auth_serv/server-extra.pkcs12

diff --git a/tests/hwsim/auth_serv/server-extra.pkcs12 b/tests/hwsim/auth_serv/server-extra.pkcs12
new file mode 100644
index 0000000000000000000000000000000000000000..c172cb32a3c9526dcf8a15f0f24751737c37792f
GIT binary patch
literal 2426
zc-mE!XH*l25`|MCAVOq=v{0mnqDf$-BQ=I5OLak|Ne?VNR3(O@C{+`Rf&xZBKm=)_
zDNP7cmLgr60a*!MFrbL5=e+m!?T?u`bMKjd_soYTa}hy6Fq+Jz!@;GPgim502XX=n
z$XqHAG8gKHEQ=;{aQ<U)6p*3&Xfkvc1O)sT>;HFzMsjffXW;>Ipm`y%))lpYlg!&3
zAP@{dB17AzQy>tDGX=4P4C40DFG1A?u|8&RGGr=QIy0vIj_0HAUrX5VKN!`d92~5N
z{-MY4^4~vD8h*;+Pwh>S+fjQXVgGr{?ZAvq&5q;PP_Gbbeln7|df$mUkf+h&Y>y;%
zU399Nbl_j^HUDsR#m0L>sHb8|`!|zE%1k(<hN<-+cKsunqX!vdx=rlMnaU7WCZqAI
zTh#t{CcV$b)5YBu)O&kam2;Z}>r^?h`Nq8Q+JTpms8{xX{jpd~7EFC45Gk1@xcFAn
z$SU;tg=)igN+8TzpS2tIN2zXOpoKAKI%!YWpwL+-zBJA|;oC@6Uzt^g5%Jy9+$4U<
zH(y{A#halh?^qj9C#jjk$PVsQIByRV2DKI@KTo|s9g06UuBlo4^v)-wbHqT}80W+(
zv=t_ngfh(lVaKuWPw6F7{)87#UNP8F6@Ix_dt_b-y{&xNZR)PIe$&MUPxH5|;FhQT
zO*PUfQ<EB@8}33yL8@Yx_QqP!8=P4@sIX1%l-Ky~yhG#q3iv``4KejL0pu6mutNTL
zA^GK#I)sy$!Y2gGGOSD_kI9WyCb>P4C+u3<)zL<=UYNF6FhKp>h=PnfWx|F=o9|sZ
z^I{?=%a<k6L@R!Hi)s4$O3@yC{RvcZ9k%-6ZgHN!tLl4J+Je@oAc7sD-Q&f+$-fBE
z%$%1k3?bc=D641&N=ql`B?jkPiWJ1pz7a4_;$*sDMy8d0)d#=*q7dyOZ15eoSD20r
z)O^0*{V*m5eWT8J6$v1@Y$uCkv>y|S!h*dM-PHW|IZCbisk}+aYM%frR-KbVdQEB;
zgbOA5%s`#UB+?qIN&o8j?Uo2?Q*B3@{YNwHBSS>ahxk0F7LvX!792AJ@dRWIMF($?
zUgaC%KVwS7hSbEvo~O>AT^c9x9SGug=Br<?_+CHr>xr`9EaY%?P@^N<2bV1GubxS$
zT$?EIaH%&Oe{6X{VM@ES#IW?P9?-EMRy@!8Y$VRmgZKE_g9uBNd(yIm<p)E`N=Muu
z&5T6X?x5bO0yPE(GqJ&FH;Qu?Dp{5Zg>KG<C8h-%tzS6lVZG)l&n~QmE)s*(ctzAj
zwALJ}yMFT%49v92yOyU6o`F0jXQ`&*zFOsH)qP3T5;NCQbzKWVqIfi}jx+Nrn#wFP
z_SNXsvv1nlzsM(ypHuOFa6_-oVt6cK`nMUrD4(*!n}ISB4&AVlZpLWT{Jo1uUgxbA
z>N0j!t@Fp!KJ%t;*oBwtNa1v&>jAC7L1DHSA736LVJqfK+WZFj{+u({{RM_e(AZ$e
z<y<Lm+lBJcNZah?>FhN7=HC+?P=?;o@MF#IBzWdxac4UOL<j9-Rb`5V?#$VHXSXw+
zg-rC|8e|IXzwc|8AGIb=jzU+BmuMq#l4?fk0S84bG1$R|J;j0C<rQI@Kw3w};Jr5>
z)uqL4WaudpC!KMek@ohj$u*>VYl%oA)qi2J*mbZrE91y(GYGNcE)~`|wH<$&GfkY1
z|J12|+L$aFVk{+Dt5B(Zs(*7AkuS^G8kLVO4nqc@ZCXaDeOfK>o+D)vUHS8+vvp7*
z!fyNxCH2g*v<L$p8{nn$^|u`+$<NY0!yTGkyJ_n<P8K*u>W1+vd{XkPWvl*mpNqHX
z@$-M4N0sbICo^-RY{gRj0xaVZu8w3dcGoogP`>cWv67I^Z}jpMkI6E0*x_q!J0W??
zdr(2o9o28HfTUZm^)8X)3!V(k$??Imqkzb`1m#CGyAoni-%h-PE3T7(ZJ|6B=`rcZ
zpLi_f0b_C(gT10zP^`boB_*+Erp0RE%xItY^zh(1TgWhy__ZvlLf7nSOdE<X{>2@D
zpSb6y-=WA?R*H<+R{8oNPEy;EEh`-h6N<W%sAS--F17$qc3E||6Ud#}X}2i-!oFDA
zGi}!RrRvv__r8RNl<;!})277BXfpWZzbFCbgpk2M-~synqrP$+`|tbb27(I6pyD55
z(Z8qw{z-*r$!#HW$CbYSqymHtA{kX}O0&66Kg#7lO_`zVe6Bg^+}vSk*z8r>6Y3`z
zU1<$|UTdb`&W6RA$3Pop7)|c(ZI$fEDI(UPh%m4fPpMs8tiII?6X%V*z;k?-koW~5
zS3md2y?L;}rOy##qa(*RNb#Z{qpA8rmZ&(vh9(>SeumBz$BbvzmB4=LFWPS9J|VnJ
z_3$&F+UtK!aw^R)%qzc%P<g>tT5S#$MDgnu5wsCN#nu;lhr)@5n1vepa;xg;tqk-6
z1{|uadrmXTBc{f%zG~+(9S#E|+m@IK?|&3vRecwo?pARd7BFF#4p`AdK{<-Fhtnh1
z;MVm4x^eryi5jjVpdJ2#r-@lzyOi}*w`Y$^H-S_k(e6QmcaU_AiOmkNhljIh{RppV
zFd_}hBG8vBuTN_?P74TpRq&pz?(0Kg6cr=wU><lTCEuAMaXnyf;WnqvfU)cE>4g;&
z`u0`5S*>5IPx|H=!RDYf=j~)tF3*pC2&{S`VU=s=G3}mxVCUE+i9VMS)W)8=TmCJ;
zmdi3jptJkqHe+D9ZNP@j%agJzwAa%$W`ftCQTnS^P7JhKXj$52PvBn3YU$x`b{fcp
zu3P8$@sp)(v!(`zo!t0T2apMHH{HMNCeM<t`iM3>jMyCOJAgBlo*S&yXIVYg&Oe-x
zQ{jhx>98O&w5D{Vfg4Y}vK#h2T<p92IF_xaCZvwxJ2FofAIB+Tteu5kD#r)c$2o4*
zpIQ?WOA_Ycag~N?DwgECrBI>82Hk#1O2KQDL#u8g3FMo@cm`w5@wNOm&yZ8oi6WMl
z+MA2Cp^<9DF7DcyLaR+1xdZ~Y*|4u1ckC5QQ||bC>G>E#wCMj*&4s}5it_+M0iJ*m
z0P$x>OaEgEU`|31B{814<<XtF$nNwMDF9XNfMJe8W6-D2TpUm(UNA@m3V<LM`T%QG
g_*tF`!SKj}>O=Kzm9~cv*a@(nE8l{I`OoP84NAji$^ZZW

literal 0
Hc-jL100001

diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
index adabaff7f..6a3282904 100644
--- a/tests/hwsim/test_ap_eap.py
+++ b/tests/hwsim/test_ap_eap.py
@@ -3996,6 +3996,19 @@ def test_ap_wpa2_eap_ttls_server_pkcs12(dev, apdev):
                    ca_cert="auth_serv/ca.pem", phase2="auth=MSCHAP",
                    scan_freq="2412")
 
+def test_ap_wpa2_eap_ttls_server_pkcs12_extra(dev, apdev):
+    """EAP-TTLS and server PKCS#12 file with extra certs"""
+    skip_with_fips(dev[0])
+    params = int_eap_server_params()
+    del params["server_cert"]
+    params["private_key"] = "auth_serv/server-extra.pkcs12"
+    params["private_key_passwd"] = "whatever"
+    hostapd.add_ap(apdev[0]['ifname'], params)
+    dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
+                   identity="mschap user", password="password",
+                   ca_cert="auth_serv/ca.pem", phase2="auth=MSCHAP",
+                   scan_freq="2412")
+
 def test_ap_wpa2_eap_ttls_dh_params(dev, apdev):
     """WPA2-Enterprise connection using EAP-TTLS/CHAP and setting DH params"""
     params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
-- 
2.47.3