commit f1c9764c0e022457636216594483865aea6a1286
author Hai Shalom <haishalom@google.com> Fri Jul 19 23:42:07 2019 +0000
committer Hai Shalom <haishalom@google.com> Fri Jul 19 23:44:14 2019 +0000
tree bf7b681326e75e2b07f49d2a2ccbee39bea7ded9
parent 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda

Revert "[wpa_supplicant] Cumulative patch from b8491ae5a"

This reverts commit 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda.

Reason for revert: git_master/sdk_phone_armv7-sdk

Change-Id: I6070fc5c1f9c20867f6dfce90e529e35578d572e

src/ap/authsrv.c

diff --git a/src/ap/authsrv.c b/src/ap/authsrv.c
index b3d9107..eced6c7 100644
--- a/src/ap/authsrv.c
+++ b/src/ap/authsrv.c
@@ -120,8 +120,6 @@
 	srv.eap_fast_prov = conf->eap_fast_prov;
 	srv.pac_key_lifetime = conf->pac_key_lifetime;
 	srv.pac_key_refresh_time = conf->pac_key_refresh_time;
-	srv.eap_teap_auth = conf->eap_teap_auth;
-	srv.eap_teap_pac_no_inner = conf->eap_teap_pac_no_inner;
 	srv.eap_sim_aka_result_ind = conf->eap_sim_aka_result_ind;
 	srv.tnc = conf->tnc;
 	srv.wps = hapd->wps;
@@ -197,8 +195,7 @@
 #ifdef EAP_TLS_FUNCS
 	if (hapd->conf->eap_server &&
 	    (hapd->conf->ca_cert || hapd->conf->server_cert ||
-	     hapd->conf->private_key || hapd->conf->dh_file ||
-	     hapd->conf->server_cert2 || hapd->conf->private_key2)) {
+	     hapd->conf->private_key || hapd->conf->dh_file)) {
 		struct tls_config conf;
 		struct tls_connection_params params;
 
@@ -227,11 +224,8 @@
 		os_memset(&params, 0, sizeof(params));
 		params.ca_cert = hapd->conf->ca_cert;
 		params.client_cert = hapd->conf->server_cert;
-		params.client_cert2 = hapd->conf->server_cert2;
 		params.private_key = hapd->conf->private_key;
-		params.private_key2 = hapd->conf->private_key2;
 		params.private_key_passwd = hapd->conf->private_key_passwd;
-		params.private_key_passwd2 = hapd->conf->private_key_passwd2;
 		params.dh_file = hapd->conf->dh_file;
 		params.openssl_ciphers = hapd->conf->openssl_ciphers;
 		params.openssl_ecdh_curves = hapd->conf->openssl_ecdh_curves;