From 912c6ecf72fb2c84fbf17dbd0666492778dbd9fc Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 30 Mar 2015 13:16:51 -0700 Subject: Cumulative patch from commit 989e784601887734e696b3fac0ad6d101badd7ea 989e784 P2P: Optimize scan frequencies list when re-joining a persistent group 154a1d5 hostapd: Fix some compilation errors ce18c10 Add support for CONFIG_NO_ROAMING to Makefile 65a7b21 OpenSSL: Implement AES-128 CBC using EVP API 22ba05c Explicitly clear temporary stack buffers in tls_prf_sha1_md5() 940a4db Explicitly clear temporary stack buffer in sha1_t_prf() eccca10 Explicitly clear temporary stack buffer in hmac_sha256_kdf() e8e365d wext: Add support for renamed Host AP driver ifname fc48d33 Improve error messages related to EAP DB c469d62 Error out if user configures SQLite DB without CONFIG_SQLITE 270427e HS 2.0R2: Add more logging for hs20-osu-client icon matching 8e31cd2 OSU server: Improve logging for SPP schema validation failures 23dd15a http-curl: Improve log messages e7d285c OSU server: Print out signup ID if there is some problem with it 1b45006 HS 2.0R2: Remove unused argument identifier from hs20-osu-client 2e7a228 HS 2.0R2: Allow custom libcurl linkage for hs20-osu-client a52410c Allow PSK/passphrase to be set only when needed 3e808b8 EAP-pwd peer: Add support for hashed password e4840b3 EAP-pwd server: Add support for hashed password 2bd2ed2 EAP-pwd: Mark helper function arguments const when appropriate 9ccc10f wpa_cli: Use tab as only word separator for networks 5a997b2 wpa_cli: Completion routine for dup_network command 1ca6c0f wpa_cli: Completion for remove, select, disable, enable network 7e6cc90 wpa_cli: Implement completion routine for get_network/set_network 32a097f wpa_cli: Keep track of available networks 94dc0e9 wpa_cli: Allow tab as alternative separator for cli_txt_list words efa232f Add support for virtual interface creation/deletion ba87329 wpa_cli: Use .wpa_cli_history under Android 0f8385e Show OSEN key management properly in scan results e7b4cd0 wpa_gui: Add tray icon based signal strength meter 54d3dc9 AP: Unset HT capabilities for an HT association request without WMM Change-Id: I71425b8e20fe1dfdb777592257dc4e4063da8d85 Signed-off-by: Dmitry Shmidt --- hostapd/Android.mk | 2 ++ hostapd/Makefile | 3 +++ hostapd/config_file.c | 6 ++++++ 3 files changed, 11 insertions(+) (limited to 'hostapd') diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 54b139ca..78a15063 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -688,8 +688,10 @@ endif endif ifdef NEED_AES_CBC NEED_AES_DEC=y +ifneq ($(CONFIG_TLS), openssl) AESOBJS += src/crypto/aes-cbc.c endif +endif ifdef NEED_AES_DEC ifdef CONFIG_INTERNAL_AES AESOBJS += src/crypto/aes-internal-dec.c diff --git a/hostapd/Makefile b/hostapd/Makefile index d718c15e..3c7bd6f9 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -227,6 +227,7 @@ CFLAGS += -DCONFIG_SAE OBJS += ../src/common/sae.o NEED_ECC=y NEED_DH_GROUPS=y +NEED_AP_MLME=y endif ifdef CONFIG_WNM @@ -683,8 +684,10 @@ endif endif ifdef NEED_AES_CBC NEED_AES_DEC=y +ifneq ($(CONFIG_TLS), openssl) AESOBJS += ../src/crypto/aes-cbc.o endif +endif ifdef NEED_AES_DEC ifdef CONFIG_INTERNAL_AES AESOBJS += ../src/crypto/aes-internal-dec.o diff --git a/hostapd/config_file.c b/hostapd/config_file.c index cae9fd30..82b08f92 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -222,9 +222,15 @@ static int hostapd_config_read_eap_user(const char *fname, return 0; if (os_strncmp(fname, "sqlite:", 7) == 0) { +#ifdef CONFIG_SQLITE os_free(conf->eap_user_sqlite); conf->eap_user_sqlite = os_strdup(fname + 7); return 0; +#else /* CONFIG_SQLITE */ + wpa_printf(MSG_ERROR, + "EAP user file in SQLite DB, but CONFIG_SQLITE was not enabled in the build."); + return -1; +#endif /* CONFIG_SQLITE */ } f = fopen(fname, "r"); -- cgit v1.2.3