aboutsummaryrefslogtreecommitdiffstats
path: root/src/eap_common
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2015-04-23 10:34:55 -0700
committerDmitry Shmidt <dimitrysh@google.com>2015-04-23 10:40:14 -0700
commit9d9e60286e05ae45025b672636490bd12586138d (patch)
treea9bb889080996ca5fd8272b6fff7f2c3abb3ce06 /src/eap_common
parent8347444e0bfb85e4550817fc99903f38ce8f5bcc (diff)
downloadandroid_external_wpa_supplicant_8-9d9e60286e05ae45025b672636490bd12586138d.tar.gz
android_external_wpa_supplicant_8-9d9e60286e05ae45025b672636490bd12586138d.tar.bz2
android_external_wpa_supplicant_8-9d9e60286e05ae45025b672636490bd12586138d.zip
Cumulative security patch from commit ca68a8b561c48393c8ba25055ce294caaa3ac008
ca68a8b WPS: Explicitly reject Public Key attribute with unexpected length 6b94f71 WPS: Truncate variable length string attributes to maximum length f4b64c6 Simplify VHT Operation element parsing d6fefd6 Simplify HT Operation element parsing 40baac0 Simplify VHT Capabilities element parsing baae4cb Simplify HT Capabilities element parsing b39a059 Simplify Timeout Interval element parsing e8997b9 Simplify ERP element parsing f87c99c Simplify DSSS Parameter Set element parsing ae7a42b FT: Check FT, MD, and Timeout Interval length in the parser c9bf7b6 Fix a memory leak on mesh_attr_text() error path 2531036 FT: Fix WMM TSPEC validation in driver-based AP MLME case 632931c P2P: Use WPS_SEC_DEV_TYPE_MAX_LEN in P2P array definition 0f5acfb Use common is_ctrl_char() helper function 5a041ac WPS: Ignore too long SSID attribute d6c3067 Replace SSID_LEN with SSID_MAX_LEN eaa8eef Replace MAX_SSID_LEN with SSID_MAX_LEN 81847c2 Replace HOSTAPD_MAX_SSID_LEN with SSID_MAX_LEN 6fb761c Replace WPA_MAX_SSID_LEN with SSID_MAX_LEN d9d1b95 Use SSID_MAX_LEN define instead of value 32 when comparing SSID length 65b1025 WPS: Ignore too long Device Name attribute cc6f243 Add WPS_DEV_NAME_MAX_LEN define and use it when comparing length dd3d857 P2PS: Check for maximum SSID length in Persistent Group Info 05e46a9 Ignore too long SSID element value in parser 90758f0 Mark QCA vendor command id 53 reserved, but not used anymore f41ded6 Remove unused leftover from multi-SSID design cb71a83 OpenSSL: Clean up TLS PRF implementation 7f90a23 Add QCA vendor subcmd for OCB 897418a eap_example: Fix configuration by added DH parameters Change-Id: If688231edfce41163ef0c1f0ad75291a9bdfbe81 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eap_common')
-rw-r--r--src/eap_common/Makefile29
1 files changed, 26 insertions, 3 deletions
diff --git a/src/eap_common/Makefile b/src/eap_common/Makefile
index adfd3dfd..f00b438c 100644
--- a/src/eap_common/Makefile
+++ b/src/eap_common/Makefile
@@ -1,8 +1,31 @@
-all:
- @echo Nothing to be made.
+all: libeap_common.a
clean:
- rm -f *~ *.o *.d *.gcno *.gcda *.gcov
+ rm -f *~ *.o *.d *.gcno *.gcda *.gcov libeap_common.a
install:
@echo Nothing to be made.
+
+include ../lib.rules
+
+LIB_OBJS= \
+ chap.o \
+ eap_common.o \
+ eap_eke_common.o \
+ eap_eke_common.o \
+ eap_fast_common.o \
+ eap_gpsk_common.o \
+ eap_ikev2_common.o \
+ eap_pax_common.o \
+ eap_peap_common.o \
+ eap_psk_common.o \
+ eap_pwd_common.o \
+ eap_sake_common.o \
+ eap_sim_common.o \
+ eap_wsc_common.o \
+ ikev2_common.o
+
+libeap_common.a: $(LIB_OBJS)
+ $(AR) crT $@ $?
+
+-include $(OBJS:%.o=%.d)