From: Jouni Malinen <j@w1.fi>
Date: Fri, 1 Nov 2013 13:39:10 +0000 (+0200)
Subject: AOSP: wpa_supplicant/Android.mk changes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9120055f2f6df05646ece62b35707e2a58f5b59;p=thirdparty%2Fhostap.git

AOSP: wpa_supplicant/Android.mk changes

These came as a part of this AOSP commit (but do not match upstream):

commit d5e4923d04122f81300fa68fb07d64ede28fd44d
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Dec 3 15:08:10 2012 -0800

    Accumulative patch from commit f5f37d3a4fc2df2a24676b4f95afca15ed793cba

    Author: Jouni Malinen <j@w1.fi>
    Date:   Sun Nov 25 22:05:32 2012 +0200

       Fix REAUTHENTICATE command after PMKSA caching

       The current PMKSA cache entry needs to be clear to allow EAPOL
       reauthentication to be started in case this association used PMKSA
       caching.

     - Remove old WPS_OOB NCF
     - WPS: Add preliminary NFC connection handover support for Enrollee
     - WPS: Reenable the networks disabled during wpa_wpas_reassoc
     - P2P: Avoid multi-channel scans when they are not needed
     - P2P: Allow discoverable interval for p2p_find to be configured
     - P2P: Allow all channels with multi-channel concurrency
     - Bonjour changes
     - Remove disassociate
     - HS 2.0 changes
     - Add preliminary support for using SQLite for eap_user database
     - Add SAE support
     - Add disallow_aps parameter to disallow BSSIDs/SSIDs

    Change-Id: I85358a05b39d46b8db49acdad667e771c580b05c
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 6947fa8f1..6edc52e0a 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -335,6 +335,17 @@ TLS_FUNCS=y
 CONFIG_IEEE8021X_EAPOL=y
 endif
 
+ifdef CONFIG_EAP_UNAUTH_TLS
+# EAP-UNAUTH-TLS
+L_CFLAGS += -DEAP_UNAUTH_TLS
+ifndef CONFIG_EAP_UNAUTH_TLS
+OBJS += src/eap_peer/eap_tls.c
+OBJS_h += src/eap_server/eap_server_tls.c
+TLS_FUNCS=y
+endif
+CONFIG_IEEE8021X_EAPOL=y
+endif
+
 ifdef CONFIG_EAP_PEAP
 # EAP-PEAP
 ifeq ($(CONFIG_EAP_PEAP), dyn)
@@ -915,6 +926,10 @@ OBJS += src/crypto/fips_prf_openssl.c
 endif
 LIBS += -lcrypto
 LIBS_p += -lcrypto
+ifdef CONFIG_TLS_ADD_DL
+LIBS += -ldl
+LIBS_p += -ldl
+endif
 endif
 
 ifeq ($(CONFIG_TLS), gnutls)