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
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

literal 0
HcmV?d00001

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")