• Home
  • History
  • Annotate
  • only in /external/wpa_supplicant_8/
History log of /external/wpa_supplicant_8/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
326450198720862ade868801cc2f43597f3c1fd8 09-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
0a217de1802bc5cf785524c1913af7ae3faa9c54 05-Feb-2015 Vinit Deshpande <vinitd@google.com> Don't write to wpa_supplicant.conf directly

There is a chance that wpa_supplicant may get killed during
the time it is writing config file. If this happens, user
information like SSIDs and passwords can be lost forever.

This change works around that by writing config to a
temporary file and then renaming the file to the correct name.

Bug: 19224089

Change-Id: I1709cdd5e5c6dfa3073e42c644fae941b43401cc
Signed-off-by: Vinit Deshpande <vinitd@google.com>
pa_supplicant/config_file.c
d02cea1c6892553734738ff70c05f55d2dc2ffc5 08-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
adaa28a85b3a1e28d36875bdf9113fea8eeb0248 04-Dec-2014 Dmitry Shmidt <dimitrysh@google.com> Merge "Return only full network line in list_networks" into lmp-mr1-dev
aeec9b8de9b57d504b522cbacc5e8c3c0d07c0e1 04-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
68c7ea4c1886b7a59dd6a38da0e85a5373ca9602 04-Dec-2014 Vinit Deshpande <vinitd@google.com> Merge "List all networks despite message limit of 4096 bytes" into lmp-mr1-dev
a7c60b4c03ced564d424e4cae81b85f7112aa59b 03-Dec-2014 Jithu Jance <jithu@broadcom.com> nl80211: Ignore Connect failure for the previous association

Suppose there are two APs (AP1 & AP2) and user attempted to connect to
AP2 before the previous connection with AP1 could succeed. Now, if the
connection event comes for the older AP with failed status, we should
just ignore it as the wpa_supplicant state has moved to "ASSOCIATING"
with the new AP (AP2).

This is a similar to the case where a disconnection event is ignored for
a case where local disconnect request can cause the extra event to show
up during the next association process following that command.

Signed-off-by: Jithu Jance <jithu@broadcom.com>
Signed-off-by: vandwalle <vandwalle@google.com>
rc/drivers/driver_nl80211.c
9e37fc2607983e5c6879df1041d154a7a015c320 03-Dec-2014 Dmitry Shmidt <dimitrysh@google.com> Return only full network line in list_networks

Change-Id: I81a74db1ba1e4e48397ce779687fffda42cbd8ac
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
da134e99c37d7b8d29aab91ba68c54c1d536c598 02-Dec-2014 Vinit Deshpande <vinitd@google.com> List all networks despite message limit of 4096 bytes

This change creates 'LIST_NETWORK LAST_ID=x' form to allow
retrieval of all networks saved in the system. Without this form,
only first few (whatever fills in first 4096 bytes) can be
retrieved.

Signed-off-by: Vinit Deshpande <vinitd@google.com>
pa_supplicant/ctrl_iface.c
cf510c9a52c37ef07ff4cf7ada9ab8f832819bd5 18-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
fee0f928f4b3d742a55836f46fbbdf9e43535450 17-Nov-2014 Jouni Malinen <jouni@qca.qualcomm.com> am 658fb4ad: Work around AP misbehavior on EAPOL-Key descriptor version

* commit '658fb4adb9458c3055c64a43833f1a9e89b4db74':
Work around AP misbehavior on EAPOL-Key descriptor version
658fb4adb9458c3055c64a43833f1a9e89b4db74 14-Nov-2014 Jouni Malinen <jouni@qca.qualcomm.com> Work around AP misbehavior on EAPOL-Key descriptor version

It looks like some APs are incorrectly selecting descriptor version 3
(AES-128-CMAC) for EAPOL-Key frames when version 2 (HMAC-SHA1) was
expected to be used. This is likely triggered by an attempt to negotiate
PMF with SHA1-based AKM.

Since AES-128-CMAC is considered stronger than HMAC-SHA1, allow the
incorrect, but stronger, option to be used in these cases to avoid
interoperability issues with deployed APs.

This issue shows up with "WPA: CCMP is used, but EAPOL-Key descriptor
version (3) is not 2" in debug log. With the new workaround, this issue
is ignored and "WPA: Interoperability workaround: allow incorrect
(should have been HMAC-SHA1), but stronger (is AES-128-CMAC), descriptor
version to be used" is written to the log.

Bug: 18411110

Change-Id: I9ae12e8882adc9e785f6e4cef9f30b89bf72dcd2
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/wpa.c
fde887d79703aad98742d14fe76894224fcaa020 11-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
2e425d69801667e42b4874548f2a49dc16e95617 10-Nov-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commits: a7f5271 and 7465640

a7f5271 Update pending connect radio work BSS pointer on scan update
7465640 Invoke connect work done for all the connection failure cases

Bug: 18312770

Change-Id: I5e59edaac24c30bbfdab2e38e8ea902300b0308d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/bss.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
5e7651a6d2a0d596b67e9bfae0525896e9c88bba 08-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
d5365ebf723c26aa63cdede0e7ef45df3d8eb01d 06-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
b04878932c59fe31d475902758155669ad44819b 05-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
b07fed092a89590251fab3bbe693768177136ed3 04-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
9aeab0116db29ab14c00c1fc9686e88378b1ac59 03-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
2951f7e78a117747a3379b7f3e8c22cb4f0517b0 02-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
d49608fe75a4dc46a98144960b9ea8d828a7a2b9 01-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
07b23dbc1c8eaac18f8aec5c4aa3ded66e6dfe66 30-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
eb3a1f82bcef55e42b9e33bfc3bc70a0fc706446 29-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
8e4208723b2b6323fda8557f965c351dac4658a7 28-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
c30a2603b8534f7dfd4ea97d1e45943b72d78e2b 27-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
a666cec92444a61dfe9f05ca05a9b160f8c167b7 26-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
1c3b5ac961b5feee2a478db70e8c67ce8fe32822 25-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
ac7e5cfff618d13534a7aefae747589c0974d6d9 23-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
0eb799c61a39c1a5c6fc605f34cc4e29804092a4 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
e2794b2649490004c31027d28e6fee65c3e9e00d 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
45abc4817b99afa757dcd2848018da5909878cdd 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
fba612e46035f63efad59227e38c7f7f52ef2eb6 19-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
1f2e19fecb36ae84d0b107506774da0a6f0ce334 18-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
f8d4be9ec500dfd5e74c105bf17c90a98149bdf6 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
47f26d0ae50cae8acdae549b306c672f7688bbf3 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
01eeb57f168fb1bca6db15300bb79d9b6f6b1a41 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
a85aac17f489471af3766c604855bd576d5a7242 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
99fbd4f93c1fad814d6df48af045598e023a7017 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
f1a00d26963333cbb8190d16a9d2ee4856d3ccda 11-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a7b06faf528d1765cc2712cc9a31ad45d7c3110b
a7b06faf528d1765cc2712cc9a31ad45d7c3110b 09-Oct-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch to Release 2.3

724fce8 Change version information for the 2.3 release
5cb1440 Update ChangeLog files for v2.3
2b28ef6 browser-wpadebug: Use more robust mechanism for starting browser
3d8a3ff browser-android: Use more robust mechanism for starting browser
17dc39a browser-system: Use more robust mechanism for starting browser
4a274f4 DFS: Allow 80+80 MHz be configured for VHT

Change-Id: I5562ac22e5bf8a55d0f7f8944ca0d9c8ebd8d13f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ChangeLog
rc/ap/dfs.c
rc/common/version.h
rc/utils/browser-android.c
rc/utils/browser-system.c
rc/utils/browser-wpadebug.c
pa_supplicant/ChangeLog
023a14d4d665c63d7428473e190fa88ca339d77f 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 3bbb64943b5c815d6b22b56f3255d6651294adbe
5f2c6c98952e5a8cd905338c2390ee84666822c6 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 3bbb64943b5c815d6b22b56f3255d6651294adbe
9ead16e203b81d44a2d84eadc2901ceeb7daf805 07-Oct-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit d5fe4e6c18d94465e8fb4527d51df6e8539c4d6a

d5fe4e6 Reserve QCA vendor specific nl80211 commands 34..49
a256506 AES: Extend key wrap implementation to support longer data
eefec1e AES: Extend key wrap design to support longer AES keys
98a1571 OpenSSL: Clean up one part from the BoringSSL patch
a857296 Support building with BoringSSL
1236eda Android: Remove ctrl_interface=wlan0 from config template
9ffd512 Android: Set pmf=1 to default template
45d8501 Fix out of bounds memory access when removing vendor elements
a61fcc1 Clean up authenticator PMKSA cache implementation
cb129db Clear PMKSA cache entry data when freeing them
8c8d26a Remove unnecessary PMKSA cache freeing step
9c82990 Fix authenticator OKC fetch from PMKSA cache to avoid infinite loop
47ea24c Fix PMKSA cache timeout from Session-Timeout in WPA/WPA2 cases
dc152f3 wpa_supplicant: Enable HT for IBSS
4ec6837 wpa_supplicant: Use hostapd_freq_params in assoc_params
43f02e6 wpa_ctrl: Update wpa_ctrl_recv() documentation for non-block behavior
1274ec2 dbus: Add an interface configuration entry to set the WPS methods
3e0272c nl80211: Re-read MAC address on RTM_NEWLINK
5dfbd72 nl80211: Add get_bss_ifindex() helper
f1a6131 P2P: Use only the -m config for P2P management device
08d7665 TDLS: Use WMM IE for propagating peer WMM capability
17729b0 TDLS: Fix concurrent setup test for mac80211 drivers
984dadc TDLS: Set the initiator during tdls_mgmt operations
01cb5df Sync with wireless-testing.git include/uapi/linux/nl80211.h
ca3c6b4 nl80211: Fix compatibility with older version of libnl
d76426c TDLS: Filter AID value properly for VHT peers

Change-Id: Ia2156628a590c502d9111de2727da642ff435d9a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_1x.c
rc/ap/pmksa_cache_auth.c
rc/ap/sta_info.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth_ft.c
rc/common/qca-vendor.h
rc/common/wpa_ctrl.h
rc/crypto/aes-unwrap.c
rc/crypto/aes-wrap.c
rc/crypto/aes_wrap.h
rc/crypto/crypto_openssl.c
rc/crypto/tls_openssl.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/nl80211_copy.h
rc/eap_common/eap_pwd_common.c
rc/eap_server/eap_server_fast.c
rc/pae/ieee802_1x_kay.c
rc/rsn_supp/pmksa_cache.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_ft.c
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/dbus/dbus_new_handlers_wps.c
pa_supplicant/driver_i.h
pa_supplicant/eap_proxy_dummy.mak
pa_supplicant/events.c
pa_supplicant/main.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
3bbb64943b5c815d6b22b56f3255d6651294adbe 07-Oct-2014 Jouni Malinen <jouni@qca.qualcomm.com> am 772e12cf: Cumulative security CVE-2014-3686 patch

* commit '772e12cfed81754a9fd890be7bc77bc602a549b5':
Cumulative security CVE-2014-3686 patch
772e12cfed81754a9fd890be7bc77bc602a549b5 07-Oct-2014 Jouni Malinen <jouni@qca.qualcomm.com> Cumulative security CVE-2014-3686 patch

0cf0fcc Add os_exec() helper to run external programs
12b6e6a wpa_cli: Use os_exec() for action script execution
515fa39 hostapd_cli: Use more robust mechanism for action script execution

Bug: 17880188

Change-Id: I0c6162f5339b1f3d8d2cc59203b919455abd592b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/hostapd_cli.c
rc/utils/os.h
rc/utils/os_unix.c
rc/utils/os_win32.c
pa_supplicant/wpa_cli.c
2997e3c1a28c1d35e06dd5897fc2e61d0eb974af 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 661b4f78e48c697429dc46154a4125892c001718
0ef1da2ab4d00d66e191c5f3adf96a550ec1aa68 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 661b4f78e48c697429dc46154a4125892c001718
e92df610fe740896fdac7ad223342fcbf2a4de57 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 661b4f78e48c697429dc46154a4125892c001718
ff6b4a2b63a9eaab01325dfbe79729209d9d9495 04-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 661b4f78e48c697429dc46154a4125892c001718
e13492d6ffcf63eaddc3587f5695cd622bcb52ed 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 661b4f78e48c697429dc46154a4125892c001718
e1883275c041a25009b0b8dc524a4e4f0074d925 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 376e1c49a92868fb0f2785ff01da2f5954341474
661b4f78e48c697429dc46154a4125892c001718 29-Sep-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit a313d17de943cbaf12cbf67d666af14791be8ad2

a313d17 Extend random MAC address support to allow OUI to be kept
1cbdb9d Add helper function for generating random MAC addresses with same OUI
97ed9a0 nl80211: Remove bridge FDB entry upon sta_remove()
39323bc AP: hostapd_setup_bss() code clean-up
1595eb9 P2P: Add support for 60 GHz social channel
b6ebdfb Extend STATUS command with frequency information
375f4a3 hostapd: Avoid dead code with P2P not enabled
6a60488 dbus: Add a global property to set or unset WFD IEs
4bd7e16 wifi_display: Add a utility function to set WFD subelements from IEs
d417744 wifi_display: Add a utility function to get the sub-elements as IEs
a8833b8 util: Don't use "\e"
8c6f4a5 ap_config.c: fix typo for "capabilities"
6e252b0 WPS: Fix WPS-in-search check when STA_AUTOCONNECT is disabled
e5fdc05 P2P: Remove unecessary sanity check for global p2p
ee285df P2P: Flush services based on global p2p init and not p2p ifaces
7139cf4 P2P: Decrement sd_pending_bcast_queries when sd returns success
dbdc9a1 nl80211: Fix memory leak on start radar detection error path
ed8e005 hostap: nl80211 use nl80211_put_freq_params
c267753 Add support for using random local MAC address
4d8fb63 Add helper function for generating random MAC addresses
fee354c nl80211: Add command for changing local MAC address
e49cabc P2P: Set timeout when starting GO Negotiation from Probe Req RX
7549c17 P2P: Clear pending_listen_freq when starting GO Neg/Invite
b497a21 nl80211: Ignore auth/assoc events when testing driver-SME
79e2b1c Add PMKSA_FLUSH ctrl_iface command
55c2bfa wpa_cli: Support action scripts with global ctrl_iface
063f850 wpa_cli: Increase event buffer size to 4096 bytes
fa0e917 wpa_cli: Fix PING in interactive mode with ifname_prefix
c53a9bf Check for driver's DFS offload capability before handling DFS
068e387 STA: Update scan results for ap_scan=1 skip-selection case also
7a4a93b dbus: Add SignalPoll() method to report current signal properties
a6ab82d Android: Add NO_EVENTS parameter to status command
df2508d P2P: Check os_get_random() return value more consistently
54461f3 RADIUS server: Remove unreachable code
e4474c1 FT: Fix hostapd with driver-based SME to authorize the STA
0800f9e nl80211: Add roaming policy update using QCA vendor command
0ef023e Add support for driver command to update roaming policy
0cd9846 nl80211: Print debug info on STA flag changes
17e2091 P2P: Fix radio work issue with wait-for-peer GO Negotiation
76db5b6 Work around broken AP PMKSA caching implementation
b08d5fa WPS: Set EAPOL workarounds dynamically based on association
8511a0f WPS: Extend internal entropy pool help for key/snonce derivation
abc0553 Remove WPA_EVENT_SCAN_STARTED message from MSG_INFO log
c45dabb P2P: Deauth p2p client just after dbus notify
3ee1856 nl80211: Register eloop after hs20 action frame
3bd3257 dbus: add BSS Age property to indicate last-seen time
5c61d21 openssl: Fix memory leak in openssl ec deinit
10e7948 Fix hostapd GET_CONFIG wpa_pairwise_cipher value
3a413e0 RADIUS client: Check getsockname() return value
9c196f7 HTTP: Fix OCSP status check
cb5ef95 SME: Verify that os_get_random() succeeds for SA Query
c9cd78e RADIUS server: Fix IPv6 radiusAuthClientAddress mask
5e62cfd P2P: Verify that os_get_random() succeeds
6473e80 EAP-PAX server: Add explicit CID length limit
6a6566c Remove unnecessarily shadowed local variable
df756b3 hostapd: Remove unused variable assignment
e47abdb TDLS: Decline Setup Request with status code 37 if BSSID does not match
ce2002a TDLS: Add RSN and Timeout interval IEs in TDLS Discovery Response frame
1c2aa04 P2P: Do not add P2P IEs on P2P disabled interface
f2e9083 nl80211: Add more RTM_NEWLINK/DELLINK debug messages
728ff2f nl80211: Fix RTM_DELLINK processing for bridge events
e5a4b85 WPS: Merge mixed-WPA/WPA2 credentials if received in same session
db9418b Add printf NULL checks to silence static analyzer
4e53675 P2P: Overwrite pending interface only after verifying BSS entry
04a258e hostapd: Check that EVENT_ASSOC data is present before using it
1cc0d6a wpa_supplicant: Use freq_list scan filtar in sched_scan

Change-Id: Ibc18f6761b3ccfe8fb4479f26f53e70942068bc8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/ap_config.c
rc/ap/beacon.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/sta_info.c
rc/common/qca-vendor.h
rc/crypto/crypto_openssl.c
rc/drivers/driver.h
rc/drivers/driver_common.c
rc/drivers/driver_nl80211.c
rc/drivers/drivers.mak
rc/drivers/drivers.mk
rc/eap_server/eap_server_pax.c
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_sd.c
rc/p2p/p2p_utils.c
rc/radius/radius_client.c
rc/radius/radius_server.c
rc/rsn_supp/tdls.c
rc/utils/common.c
rc/utils/common.h
rc/utils/http_curl.c
rc/wps/wps_enrollee.c
rc/wps/wps_registrar.c
pa_supplicant/bss.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new.h
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/dbus/dbus_new_handlers_p2p.h
pa_supplicant/driver_i.h
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/notify.c
pa_supplicant/notify.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wifi_display.c
pa_supplicant/wifi_display.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
3792d64afaeb84beee4032e60e5caa2894488b6d 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 376e1c49a92868fb0f2785ff01da2f5954341474
c414462825e1e46b97dbfa05d79e5bb896378c18 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 376e1c49a92868fb0f2785ff01da2f5954341474
2f1e8025b56c258cc4eadcd2c89f86c5a77cb3a2 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 376e1c49a92868fb0f2785ff01da2f5954341474
11489781b2208237ecf4b435d5aa0c06ec2de156 27-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 376e1c49a92868fb0f2785ff01da2f5954341474
c7053b47739e4f692b504b63b309d669f560eec3 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ffc7018e299837b8206c6e351db8930cfa6aa3f4
376e1c49a92868fb0f2785ff01da2f5954341474 24-Sep-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Skip explicit conf_p2p_dev loading for main interface

Bug: 17064125

Change-Id: Ib53daf22c84f2581b499462dc09a74ccfbac226a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant.c
8bde9cb099f040f26c1a51106d44c1008119817f 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ffc7018e299837b8206c6e351db8930cfa6aa3f4
a4ca3e2ca30bb0cf6a043df4173c4f6c3aab874c 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ffc7018e299837b8206c6e351db8930cfa6aa3f4
dc80e461578ccb376a731f1b30dcd60694e7ff40 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ffc7018e299837b8206c6e351db8930cfa6aa3f4
6e97eaa397d4e8d9f923fbbce546bfc11f579176 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ffc7018e299837b8206c6e351db8930cfa6aa3f4
514c8d0f7726e8950ff6eb3c544db8ec0abc3778 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ffc7018e299837b8206c6e351db8930cfa6aa3f4
d951c60cfa51e5dcc7ce2792e5d53383872438f9 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ffc7018e299837b8206c6e351db8930cfa6aa3f4
ffc7018e299837b8206c6e351db8930cfa6aa3f4 11-Sep-2014 vandwalle <vandwalle@google.com> Android: Add NO_EVENTS parameter to status command

It also allows to use the STATUS command with default behavior,
say for debug, i.e., don't generate a "fake" CONNECTION and
SUPPLICANT_STATE_CHANGE events with the new STATUS-NO_EVENTS case.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
db5ac1f802519c12d8e2cd12b1596ea9a87ecc21 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
0e875ca0cc404c34d99f592d940d9fd77714d264 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
5b2fae9819eeb735d231e66f8d1f7ad08ca5ada8 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 8deca702d6a9310ecfbd03727df1f1367abffff9
d597983db2090b2596f9404619e5f731d02a0db7 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
8deca702d6a9310ecfbd03727df1f1367abffff9 11-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
2fd90d8fa89609e5852b26504a633212ad1ad2b3 10-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
3ba48b98bbf4322db6f7fb659ac1d5e4aa4a2a0a 09-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
6b4e99d918eb843675ddd543d94154441573b091 08-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
2bcdeb28715b2709d3a0f8aceea9f9d2cbbe4bcb 07-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
c3503210b9f0ffd30cf68653bb3d9b8a5e017154 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 56035fa7d47975d51c4d5a10eef936d86097bf65
9d192ad93b368afb9e31da37605b857acaaa7917 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fe06c00f24363ca6964963f849c76797f072323b
56035fa7d47975d51c4d5a10eef936d86097bf65 05-Sep-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Remove ctrl_interface=wlan0 from config template

Bug: 14391322

Change-Id: I349727fa4d02925772081d29fcc9a181baf08526
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant_template.conf
fe06c00f24363ca6964963f849c76797f072323b 05-Sep-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Remove ctrl_interface=wlan0 from config template

Bug: 14391322

Change-Id: I349727fa4d02925772081d29fcc9a181baf08526
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant_template.conf
faa2d7a546126325077cabf13811078749faa6cd 04-Sep-2014 Dmitry Shmidt <dimitrysh@google.com> Set pmf=1 to default template

Bug: 17294530

Change-Id: Iffafed5332d04edd59b602395b8433cdbc82fb83
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant_template.conf
0207e233ee2e741f7b2c124c1366e905ebb634c8 03-Sep-2014 Dmitry Shmidt <dimitrysh@google.com> hostapd: Add wowlan_triggers config param

New kernels in wiphy_suspend() will call cfg80211_leave_all()
that will eventually end up in cfg80211_stop_ap() unless
wowlan_triggers were set.

Bug: 17269024

Change-Id: I14d2191eda090cd86cabe1e5f059975fdf2f69e8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/main.c
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/common/wpa_common.c
pa_supplicant/wpa_supplicant.c
57cea1a480975338d84f7bbc229b4dc76e030600 20-Aug-2014 Jithu Jance <jithu@broadcom.com> P2P: Avoid trunction of extended listen due to offchan tx

On receiving the cancel remain on channel event, the pending_tx
is scheduled immediately and returned. This was preventing
the wpas_p2p_listen_start function from execution thereby resulting
in termination of the extended listen.

Bug: 17027752

Change-Id: Ib12425f144364e92b3a5539fba3a850779b4fe2b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/offchannel.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
1d57ba2e974d60c4b36b65c9d58f6ec7cebad0aa 19-Aug-2014 Jithu Jance <jithu@broadcom.com> P2P: Clear the discovery state incase of deffered GO Neg response

Bug: 17027752

Change-Id: I7d16080864264b838169f7b477598353c5d61d37
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
5c879ee8a1def48a71e0929d378c0912ef63bb3f 18-Aug-2014 Jouni Malinen <j@w1.fi> STA: update scan results for ap_scan = 1 case also

Bug: 17027752

Change-Id: Ic5a4db271b38f310f567bf9f536a9d95f2a599e6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
03658834c33748b9ad86f3d4cdf0c7be9c6887d1 13-Aug-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 4aa9c156e583c64cf5d90751ec888c478e1155c2

4aa9c15 dbus: Close dbus dict just after appending data
b8d87ed nl80211: Disable Probe Request reporting for static AP during deinit
bf144cf nl80211: Do not change iftype for static AP interface
61157af wext: Add signal_poll callback
af65bc3 P2P: Use ssid instead of wpa_ssid to find GO iface
6c460ea Add RSN cipher/AKM suite attributes into RADIUS messages
cdffd72 Add WLAN-HESSID into RADIUS messages
69002fb Add Mobility-Domain-Id into RADIUS messages
4a0693a dbus: Declare and implement GroupFinished as for GroupStarted
2fa980f P2P: Cancel pending action TX radio work on p2p_cancel
8b627b7 Fix writing of the wowlan_triggers parameter

Bug: 16877362

Change-Id: Ifbb8902e2634470ba212a82cd1ca49880633d961
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_1x.c
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/drivers/driver_nl80211.c
rc/drivers/driver_wext.c
rc/radius/radius.c
rc/radius/radius.h
pa_supplicant/config_file.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
7f0b69e88015ca077ef7a417fde0a76c10df23a5 28-Jul-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit e8c08c9a363340c45baf8e13c758c99078bc0d8b

e8c08c9 EAP-FAST server: Fix potential read-after-buffer (by one byte)
8b65fef Interworking: Remove unnecessary placeholder for PAME-BI
27a725c EAP: Do not allow fast session resumption with different network block
52f4abf P2P: Remove PSK/passphrase from P2P-GROUP-STARTED debug log entry
f8723e1 P2P: Use a helper function for P2P_EVENT_GROUP_STARTED events
905c722 Add wpa_msg_global_ctrl()
1f1fe19 EAP-pwd: Clear identity string and temporary buffer explicitly
f119d66 EAP-pwd: Verify BN_rand_range return code
5197f03 EAP-pwd: Use os_memcmp_const() for hash comparisons
26c10f7 OpenSSL: Use EC_POINT_clear_free instead of EC_POINT_free
3248071 OpenSSL: Use BN_clear_free instead of BN_free
870dfe9 EAP-TTLS: Remove FreeRADIUS workaround for EAP-TTLS/MSCHAPv2

Bug: 15615050, 16493485

Change-Id: I7028a61ad6dbda1f336376cc0568b81046045725
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/crypto/crypto_openssl.c
rc/eap_common/eap_pwd_common.c
rc/eap_peer/eap.c
rc/eap_peer/eap_i.h
rc/eap_peer/eap_pwd.c
rc/eap_peer/eap_ttls.c
rc/eap_server/eap_server_fast.c
rc/eap_server/eap_server_pwd.c
rc/utils/wpa_debug.c
rc/utils/wpa_debug.h
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
0f4fce149db4f45a9eb6776186c1858f8083e6f4 19-Jul-2014 Elliott Hughes <enh@google.com> Always #include <sys/...>, not <linux/...>.

(cherry picked from commit faf7d62bbbe8529a7558ddd72ba4a8960298e33f)

Change-Id: I8c7f4b31ac828eb9cdb698e38a04256b8c3fc88c
rc/utils/os_unix.c
7abb852a009dff5a3fea6e9c89730a6352fe44fd 16-Jul-2014 Dmitry Shmidt <dimitrysh@google.com> HS20: Keep backward compatibility with old icu

Change-Id: I3eb3960331fcf4e6e7c2562a278be62ecf3a85d7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
s20/client/Android.mk
2e67f06149ff649fb6f8782bad041d3d9124685e 16-Jul-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 6d00ab04302df257cb3092b2b31b4eac42e77569

6d00ab0 nl80211: Ensure nl_preq unregistration on driver deinit
71a0e39 P2P: Make unrecognized vendor elements available in P2P_PEER
86bd36f Add generic mechanism for adding vendor elements into frames

Change-Id: I392072a37d8dbfc92769082b60f052f7095466b6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/ieee802_11_defs.h
rc/common/wpa_ctrl.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_group.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_pd.c
pa_supplicant/ctrl_iface.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
2f9ffba33e8d57edccf0932cc0b1f8f3bbe77c54 10-Jul-2014 Elliott Hughes <enh@google.com> Switch wpa_supplicant to the new icu.

Change-Id: I637808b27a7ff1f20636cf00b242c8da661e3840
s20/client/Android.mk
0a67fb8a30fa69ee3b158f981bb1f6865bfbdef5 09-Jul-2014 Jeff Sharkey <jsharkey@android.com> CleanSpec!

Change-Id: I76017cca53a19e928a781a03182c94183a3cbecd
leanSpec.mk
6aa8ae4b6139bdf5593301474277dcdbc2528190 07-Jul-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 4ed3492206097c24aa37b4429938fec049ba1827

4ed3492 PNO: Send Probe Request frames only for hidden SSIDs
8931a36 P2P: Add explicit check for ssid->p2p_client_list != NULL
c0e46bb DFS: Remove dead assignment

Change-Id: I16b7d38ba8fc974391d679a43f1426eb9e4bce23
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/dfs.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
c28170251eb54dbf64a9074a07fee377587425b2 02-Jul-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit e376290c667e970d751acc916e0efe2ed16292ed

e376290 HS 2.0R2: Add update_identifier field to network
5bc2857 Fix some sparse warnings about u16 vs. le16
42619d6 Fix CTRL-EVENT-REGDOM-CHANGE event init= value
a520bf4 Mark function static
0cb79d3 dbus: Fix indentation level to match code logic
8f03ac9 Mark functions static
6891f0e Allow SCAN command to specify scan_ssid=1 SSIDs
18389ab WPS: Clear keys/PINs explicitly
b7175b4 Clear hostapd configuration keys explicitly
d1ecca6 HS 2.0 R2: Clear hs20-osu-client configuration keys explicitly
0a13e06 EAP server: Clear keying material on deinit
f534ee0 EAP peer: Clear keying material on deinit
19c48da Clear wpa_supplicant configuration keys explicitly
28bfa29 EAP-AKA: Remove unnecessary dead increment
62493df EAP-GPSK: Avoid dead increment by checking pos pointer
164a453 FT: Debug print extra response data
70bfc77 PCSC: Debug print extra response data
5dbbf36 Interworking: Remove unnecessary dead increment
a1e46f3 Check for no key_mgmt/proto/auth_alg entries in config writer
290ea6a Remove unnecessary tracking of first entry
d3fa2bb WFD: Explicit limit for subelement length (CID 68127)
745ef18 HS 2.0: Verify assoc_req_ie buffer size for indication elements
0233dca SAE: Use os_memcmp_const() for hash/password comparisons
34ef46c WEP shared key: Use os_memcmp_const() for hash/password comparisons
3e4b77c EAP-GTC: Use os_memcmp_const() for hash/password comparisons
a6eae3f EAP-MSCHAPv2: Use os_memcmp_const() for hash/password comparisons
30411b3 EAP-TTLS: Use os_memcmp_const() for hash/password comparisons
a564d9c EAP-MD5: Use os_memcmp_const() for hash/password comparisons
4685482 EAP-PSK: Use os_memcmp_const() for hash/password comparisons
cba0f86 EAP-PEAP: Use os_memcmp_const() for hash/password comparisons
7b1e745 EAP-LEAP: Use os_memcmp_const() for hash/password comparisons
8f92826 EAP-GPSK: Use os_memcmp_const() for hash/password comparisons
e1550d4 EAP-PAX: Use os_memcmp_const() for hash/password comparisons
c434503 EAP-FAST: Use os_memcmp_const() for hash/password comparisons
dddf7bb EAP-EKE: Use os_memcmp_const() for hash/password comparisons
dfb5608 EAP-SAKE: Use os_memcmp_const() for hash/password comparisons
05c79d6 EAP-SIM/AKA: Use os_memcmp_const() for hash/password comparisons
675ddad EAP-IKEv2: Use os_memcmp_const() for hash/password comparisons
2049a3c TLS: Use os_memcmp_const() for hash/password comparisons
a79aea5 Milenage: Use os_memcmp_const() for hash/password comparisons
05f916e AES-GCM: Use os_memcmp_const() for hash/password comparisons
87a5c93 AES-CCM: Use os_memcmp_const() for hash/password comparisons
7c24f53 EAPOL supplicant: Use os_memcmp_const() for hash/password comparisons
870834a RSN authenticator: Use os_memcmp_const() for hash/password comparisons
0d15b69 RSN supplicant: Use os_memcmp_const() for hash/password comparisons
72619ce MACsec: Use os_memcmp_const() for hash/password comparisons
c237195 RADIUS: Use os_memcmp_const() for hash/password comparisons
ce9c9bc WPS: Use os_memcmp_const() for hash/password comparisons
afc3c8b Add constant time memory comparison function os_memcmp_const
ee352f1 EAP-pwd: Add explicit total length limit
b2b8a4c EAP-SIM/AKA: Pass EAP type as argument to eap_sim_msg_finish()
f107d00 PeerKey: Clean up EAPOL-Key Key Data processing
010fc5f dbus: Clean up array-array-type property getter

Change-Id: I1dbe483be2678a7468e6955d70ea261f8e53b26d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
s20/client/osu_client.c
rc/ap/ap_config.c
rc/ap/eap_user_db.c
rc/ap/hostapd.c
rc/ap/ieee802_11.c
rc/ap/wpa_auth.c
rc/ap/wpa_auth_ft.c
rc/common/sae.c
rc/crypto/aes-ccm.c
rc/crypto/aes-gcm.c
rc/crypto/milenage.c
rc/eap_common/eap_eke_common.c
rc/eap_common/eap_gpsk_common.c
rc/eap_common/eap_ikev2_common.c
rc/eap_common/eap_sim_common.c
rc/eap_common/eap_sim_common.h
rc/eap_common/ikev2_common.c
rc/eap_peer/eap.c
rc/eap_peer/eap_aka.c
rc/eap_peer/eap_config.h
rc/eap_peer/eap_eke.c
rc/eap_peer/eap_fast.c
rc/eap_peer/eap_gpsk.c
rc/eap_peer/eap_ikev2.c
rc/eap_peer/eap_leap.c
rc/eap_peer/eap_mschapv2.c
rc/eap_peer/eap_pax.c
rc/eap_peer/eap_peap.c
rc/eap_peer/eap_psk.c
rc/eap_peer/eap_pwd.c
rc/eap_peer/eap_sake.c
rc/eap_peer/eap_sim.c
rc/eap_peer/eap_tls.c
rc/eap_peer/eap_ttls.c
rc/eap_peer/ikev2.c
rc/eap_peer/mschapv2.c
rc/eap_server/eap_server.c
rc/eap_server/eap_server_aka.c
rc/eap_server/eap_server_eke.c
rc/eap_server/eap_server_fast.c
rc/eap_server/eap_server_gpsk.c
rc/eap_server/eap_server_gtc.c
rc/eap_server/eap_server_ikev2.c
rc/eap_server/eap_server_md5.c
rc/eap_server/eap_server_mschapv2.c
rc/eap_server/eap_server_pax.c
rc/eap_server/eap_server_peap.c
rc/eap_server/eap_server_psk.c
rc/eap_server/eap_server_pwd.c
rc/eap_server/eap_server_sake.c
rc/eap_server/eap_server_sim.c
rc/eap_server/eap_server_ttls.c
rc/eap_server/ikev2.c
rc/eapol_supp/eapol_supp_sm.c
rc/pae/ieee802_1x_kay.c
rc/radius/radius.c
rc/radius/radius_server.c
rc/rsn_supp/peerkey.c
rc/rsn_supp/peerkey.h
rc/rsn_supp/pmksa_cache.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa_ft.c
rc/tls/pkcs1.c
rc/tls/tlsv1_client_read.c
rc/tls/tlsv1_common.c
rc/tls/tlsv1_record.c
rc/tls/tlsv1_server_read.c
rc/tls/x509v3.c
rc/utils/common.c
rc/utils/common.h
rc/utils/ext_password_test.c
rc/utils/http_curl.c
rc/utils/os.h
rc/utils/os_internal.c
rc/utils/os_none.c
rc/utils/os_unix.c
rc/utils/os_win32.c
rc/utils/pcsc_funcs.c
rc/wps/wps.c
rc/wps/wps_attr_process.c
rc/wps/wps_enrollee.c
rc/wps/wps_registrar.c
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/events.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/interworking.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wifi_display.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
d30ac604c9f6da71a0dd7f46d25be05a2a62cfbb 30-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit ea18024d78bde140fb8f74d216d757816bfd6e9b

ea18024 dbus: Add PropertiesChanged signal to Peer object
36716ee P2P: Add a utility function to run a method on every known peer
bf03566 dbus: Remove GroupMember object type and use Peer instead
17a37d7 dbus: Add a Groups property to a Peer object on which it belongs
6f04642 P2P: Add utility functions to get GO/client interface
c6386e5 P2P Add a utility to run a callback on all available groups
8e76f48 P2P: Add a utility function to get the group configuration
37d8a27 TDLS: Clean up add/set peer operations
bcd2baa TDLS: Tear down connection on malformed Setup Confirm
8190540 TDLS: Abort local setup when failing to add STA
1dce7a2 TDLS: Update peer STA as soon as full peer info is available
819c943 TDLS: Remove peer from global peer-list on free
5841958 hostapd: Use channel switch fallback on error
8974620 hostapd: Perform multi-BSS CSA for DFS properly
ccac7c6 hostapd: Make chan_switch command per-interface not per-BSS
6782b68 hostapd: Move CSA parameters to hostapd_data
1de809e eapol_test: Fix -R option to not replace -s option value
3c5d34e Change channel before IBSS associations
ebffdbc nl80211: Refactor mode switch logic

Change-Id: I1cbdc4dce586ec69f693b3b04eb340a5332f6b40
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ctrl_iface.c
rc/ap/beacon.c
rc/ap/dfs.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_group.c
rc/rsn_supp/tdls.c
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new.h
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/dbus/dbus_new_handlers_p2p.h
pa_supplicant/eapol_test.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
2271d3fdd5982d0e5e81cf9999a861bba933eacb 23-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit f95a4524c2c00476e46b7999426ffdcbc7cd538f

f95a452 nl80211: Improve debug output by printing SA and DA in frames
dedfa44 Print frame type name in debug output
57a8f8a nl80211: Use low-priority scan for OBSS scan
1b928f9 P2P: Allow passphrase length to be configured
e985246 eapol_test: Add PC/SC reader and PIN command line arguments
5a62060 Use pcsc_reader configuration in one for scard_init() call
f3c6b23 EAP-SIM': Fix AT_KDF parser to avoid infinite loop
79122f9 EAP-SIM/AKA: Remove unused RESULT_FAILURE state

Change-Id: I142bed35a75ed228e145e50c961dcde22a9815f7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ctrl_iface_ap.c
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/eap_common/eap_sim_common.c
rc/eap_peer/eap_aka.c
rc/eap_peer/eap_sim.c
rc/p2p/p2p.c
rc/p2p/p2p.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.conf
0c08fdcf5231617f2340cb18e45769a8ed3a1dc4 20-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 3302b7c29f42c532c815268bcdcd09e1dbe1840c

3302b7c Rate limit SA Query procedure initiation on unprotected disconnect
4075e2f EAP-GPSK: Clean up CSuite_List length validation (CID 62854)
2dbc959 EAP-FAST: Clean up TLV length validation (CID 62853)
35cbadb VHT: Remove useless validation code from Operating Mode Notification
bed7eb6 TDLS: Do not bail when failing to process IEs in Discovery Request
7e0f4f4 TDLS: Do not reject TPK M3 when failing to process IEs

Change-Id: I85ed050d7fce0ed8eb1959688171236d87264ff4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_11_vht.c
rc/eap_common/eap_fast_common.c
rc/eap_common/eap_fast_common.h
rc/eap_peer/eap_fast.c
rc/eap_peer/eap_gpsk.c
rc/eap_server/eap_server_fast.c
rc/rsn_supp/tdls.c
pa_supplicant/events.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant_i.h
43cb578dfe2c492257636f6234a24178ed27789e 17-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 7efc7f66b1d63b3bbb99d9176f6f68c4d1fc6327

7efc7f6 TDLS: Fix TPK M1 error case (CID 68214)
d1bb7ae nl80211: Fix non-hostapd interface addition to not call add_ifidx()
38ddcca TDLS: Add ctrl_iface option for flushing all TDLS peers
342bce6 TDLS: Bail on STA add failure in tpk_m1 processing
947f900 TDLS: Handle unreachable link teardown for external setup
cf1600a hostapd: Configure driver ACL even if MAC address list is empty
fa21e6c Fix CONFIG_MODULE_TESTS=y build without CONFIG_P2P=y
bd10d93 P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h
e3bd6e9 P2P: Use another interface operating channel as listen channel
28812a8 P2P: Try using one of the social channels for GO
751b00b P2P: Modify p2p_get_pref_freq
0a816e8 P2P: Remove duplicated code from get_shared_radio_freqs_data()
504df28 Remove unused dump_freq_array()
a0c90bb P2P: Collect and use extended data on used frequencies
b278f32 P2P: Remove unused code from get_shared_radio_freqs_data()
e627012 Clean up EAPOL-Key Key Data processing
d56d7e5 Clean up EAPOL-Key processing
8605eab EAP-EKE: Fix typos in debug message
25be28a dbus: Check return value more consistently (CID 62841)
ac79fcf wext: Verify set_ssid results consistently (CID 62842)
f62415d Note chmod() failure in debug log even in ignore case (CID 62843)
305000e WPS: Check wps_build_wfa_ext() return value consistently (CID 68104)
2485835 EAP-MSCHAPv2: Check hash function results more consistently (CID 68105)
b7c61c9 Fix validation of EAPOL-Key length with AES key wrap (CID 62859)

Change-Id: I4da11c59a54467301c38c3bec52629b9db19647d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/hostapd.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_wext.c
rc/eap_peer/eap_eke.c
rc/eap_peer/eap_mschapv2.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_i.h
rc/p2p/p2p_utils.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/wps/wps_upnp.c
pa_supplicant/Makefile
pa_supplicant/ap.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_helpers.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/events.c
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
623d63a3a443027e50efdaaec027befcc3882527 13-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 6590b6400f73762fc6a53ad6ca05a73246cc5e54

6590b64 EAP-TNC: Limit maximum message buffer to 75000 bytes (CID 62873)
49d13df P2P: Fix wfd_dev_info parsing for P2P-DEVICE-FOUND (CID 68127)
1851e17 dbus: Clean up P2P group vendor ext getter
137ff33 HS 2.0R2: Fix OSEN IE parsing for in cipher setup (CID 68132)
2703fb4 WNM: Use cleaner way of generating pointer to a field (CID 68100)
da995b2 WNM: Use cleaner way of generating pointer to a field (CID 68099)
062833c GAS server: Fix request frame length validation (CID 68098)
5ce3ae4 HT: Use cleaner way of generating pointer to a field (CID 68097)
fb5d417 P2P: Use cleaner way of generating pointer to a field (CID 68096)
35c0318 P2P: Use cleaner way of generating pointer to a field (CID 68095)
e987c70 dbus: Add explicit break statements to switch-default
6446420 dbus: Initialize temporary entry properly (CID 62877)
70d9537 Use clearer way of getting pointer to a frame (CID 62835)
c02f35f WPS: Clean up indentation level (CID 68109)
0e87e79 Fix HS20_GET_NAI_HOME_REALM_LIST hex length check (CID 68108)
beb9e11 dbus: Avoid theoretical memory leaks with duplicated dict entries
ceb4cd8 dbus: Fix a potential double-free in on error path (CID 62880)
68e2b88 TNC: Fix minor memory leak (CID 62848)
5519241 GAS: Limit TX wait time based on driver maximum value
a0ab408 P2P: Fix SD and DevDisc to limit maximum wait time per driver support

Change-Id: If9bdd7b9961c775e39ce1a8fb58220052434b395
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/gas_serv.c
rc/ap/ieee802_11_ht.c
rc/ap/wnm_ap.c
rc/eap_peer/eap_tnc.c
rc/eap_peer/tncc.c
rc/eap_server/eap_server_tnc.c
rc/p2p/p2p_dev_disc.c
rc/p2p/p2p_sd.c
rc/wps/httpread.c
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_dict_helpers.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/wifi_display.c
pa_supplicant/wnm_sta.c
pa_supplicant/wpa_supplicant.c
09f57babfc1e4473db20ced4f58a4c9f082c8ed8 11-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit d3b204694a39e6c57a4c6689b87f4192e1b93a06

d3b2046 P2P: Make the default p2p_find delay value configurable
3dacd3e atheros: Add support for new GCMP/CCMP/CMAC/GMAC cipher suites
737754d EAP-IKEv2: Remove obsolete ccns.pl project workarounds
aa6bf6d eap_proxy: Check sm != NULL more consistently
4f4d51e TDLS: Add extra validation step for responder RSN IE length
a01acc5 Check for EVENT_ASSOC data to be present for AP mode operation
1fde15a GAS server: Explicitly check that home realm is available
aff0bee GAS server: Remove unused function parameter
86388af WPS: Check for theoretical gmtime() failure
d75a5ae WPS ER: Fix UDN parser to handle missing field
0bbaa9b Validate driver extended capabilities length against buffer length
9c6c558 Interworking: Reject EAP configuration with unsupported inner method
f2ca0e9 Check eap_get_name() return against NULL to silence static analyzer
bc32bb7 Make a code path easier for static analyzers to understand
fb958ea Check current_ssid on unexpected association event
2a57c33 Reserve QCA vendor specific nl80211 commands 20..33
84df167 nl80211: Add vendor attribute for interface index
9949483 The master branch is now used for v2.3 development

Change-Id: Ib39c204aaa3ebcc909057f815e5e291e15e5df88
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/beacon.c
rc/ap/gas_serv.c
rc/common/qca-vendor.h
rc/common/version.h
rc/drivers/driver_atheros.c
rc/drivers/drivers.mak
rc/eap_common/eap_ikev2_common.c
rc/eap_common/eap_ikev2_common.h
rc/eap_common/ikev2_common.c
rc/eap_common/ikev2_common.h
rc/eap_peer/eap_ikev2.c
rc/eap_peer/ikev2.c
rc/eapol_supp/eapol_supp_sm.c
rc/rsn_supp/tdls.c
rc/wps/wps_er.c
rc/wps/wps_upnp.c
pa_supplicant/Android.mk
pa_supplicant/README-P2P
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/events.c
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/sme.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a 05-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 6280df31bbbd015cb857630868a49c373325ba10

6280df3 Include CONTRIBUTIONS file in the release tarballs
b63b9a7 Change version information for the 2.2 release
6a98f67 ChangeLog entries for v2.2
d4b951f Fix offchannel TX not to retransmit pending frame on callback
95b6bca Add rsn_pairwise bits to set_ieee8021x() driver_ops
95f6f6a RADIUS/EAP server: Use longer username buffer to avoid truncation
5dff6df Fix off-by-one bounds checking in printf_encode()

Change-Id: I531fbbb2111da96174b89fd99507716df25bb1e6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ChangeLog
rc/ap/ap_drv_ops.c
rc/ap/beacon.c
rc/common/version.h
rc/eap_server/eap_server_identity.c
rc/eap_server/eap_server_mschapv2.c
rc/eap_server/eap_server_ttls.c
rc/radius/radius_server.c
rc/utils/common.c
rc/utils/utils_module_tests.c
pa_supplicant/ChangeLog
pa_supplicant/offchannel.c
pa_supplicant/wpa_supplicant_i.h
717574375e969e8272c6d1a26137286eac158abb 02-Jun-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 801e117376e13d5b3c50f1627b93a949529fdf99

801e117 Fix validation of RSN EAPOL-Key version for GCMP with PMF
3d4d234 FT: Fix GTK rekeying after FT protocol
d3d0483 nl80211: Work around error case prints for nl_recvmsgs on Android
8a387a2 P2P NFC: Fix use of freed memory
df48efc Fix external radio work stopping to not read freed memory
13c3303 SAE: Fix memory leak in random number generation
d92bdf9 hostapd: Make sure hapd->drv_priv gets cleared on driver deinit
438e133 hostapd: Use helper function to avoid duplicate deinit calls
ac1a224 hostapd: Clean up if interface setup fails
81c4fca hostapd: Reset hapd->interface_add properly
3fbd036 hostapd: Prevent double interface disabling from segfaulting
ea39367 nl80211: Fix wpa_driver_nl80211_if_add() failure paths
b77aeae Interworking: Re-trigger scan if no connect attempt is done
b523973 RADIUS client: Trigger failover more quickly if socket is not valid
09844c0 RADIUS client: Do not flush pending messages if server did not change
5d67bf1 hostapd: Fix configuration of multiple RADIUS servers with SET
70d4084 RADIUS client: Fix socket close/re-open on server change
d045cc8 RADIUS client: Fix crash issue in radius_client_timer()
c1fb75a RADIUS client: Handle ENETUNREACH similarly to other failure cases
9ed4076 RADIUS client: Do not try to send message without socket
cc0b7cb hostapd_cli: Fix segmentation fault with interface command
114153b P2P: Debug print channel lists for invitation processing
4eb3b76 OpenSSL: Fix OCSP certificate debug print to use wpa_printf
f6fb192 HS 2.0R2: Fix subscr_remediation_method for RADIUS server
74879f3 Remove extra newline from a debug print

Change-Id: I82d4f00501fabb8b325e4461178b45e7b2c0178e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd_cli.c
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/hostapd.c
rc/ap/wpa_auth.c
rc/ap/wpa_auth_ft.c
rc/common/common_module_tests.c
rc/common/ieee802_11_common.c
rc/common/sae.c
rc/crypto/tls_openssl.c
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_invitation.c
rc/radius/radius_client.c
rc/radius/radius_server.c
rc/rsn_supp/wpa.c
pa_supplicant/Makefile
pa_supplicant/ctrl_iface.c
pa_supplicant/interworking.c
pa_supplicant/wpas_module_tests.c
76cd2cc44b62e858f1897ce58f4ce7d0174e8839 27-May-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 147848ec4d26613d5a117d4b35dbc7ff98dd65d1

147848e nl80211: Do not add all virtual interfaces to drv->if_indices
de88430 nl80211: Fix del_ifidx() with mixed parent interface cases
829a1b3 P2P: Clear p2p_auth_invite after each persistent group invitation
e403ba8 Parse DMG capabilities when reporting to external interfaces
f7454c9 P2P: Add 60 GHz in channel to frequency conversion
fc3f1d1 Remove unused hostapd_ip_diff()
7bb7090 Add DRIVER_EVENT AVOID_FREQUENCIES for testing
d73c7b9 GAS: Send error response if no room for pending dialog context
658d495 HS 2.0: Include OSU client sample in wpa_supplicant release package

Change-Id: Ie2109f25bd8de2c926d4116eed37b458ae6a6950
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/gas_serv.c
rc/drivers/driver_nl80211.c
rc/p2p/p2p_utils.c
rc/utils/ip_addr.c
rc/utils/ip_addr.h
rc/utils/utils_module_tests.c
pa_supplicant/Makefile
pa_supplicant/bss.h
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpas_module_tests.c
3c57b3f85a2d1d586b8b42014a806df23d309824 23-May-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 2396f02a431dd6e4526fd79c93f06695211cb3e4

2396f02 Reserve QCA vendor specific nl80211 commands 14..19
5661bd0 P2P: Avoid resetting pending_listen_freq if p2p_listen is pending
8802326 nl80211: Indicate SHA256-based AKM suites in CONNECT/ASSOCIATE

Change-Id: Id62b66e9683e87e888b91e0fd6407c1beb87b9c6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/ieee802_11_defs.h
rc/common/qca-vendor.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
50b691dc36a8075e8f594e8bea93cb524fa6b1d2 21-May-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 54ac6ff8c4a20f8c3678e0c610716ce7795b8320

54ac6ff PKCS 1: Add function for checking v1.5 RSA signature
d381184 RSA: Add OID definitions and helper function for hash algorithms
ab6d047 Add function for building RSA public key from n and e parameters
6c5be11 PKCS #1: Enforce minimum padding for decryption in internal TLS
e6d83cc PKCS #1: Allow only BT=01 for signature in internal TLS
9c29d48 X.509: Fix internal TLS/X.509 validation of PKCS#1 signature
10b58b5 TNC: Allow TNC to be enabled dynamically
0a626a5 TNC: Move common definitions into a shared header file
4075e4e TNC: Allow tnc_config file path to be replaced
f0356ec eloop: Add epoll option for better performance
da96a6f eloop: Separate event loop select/poll implementation
68d2700 dbus: No need to recompute group object path on GroupStarted signal
f3734e2 dbus: Provide the P2P Device Address from the relevant structure
e956b83 dbus: Fix interface DeviceFound signal specification
fc591a7 dbus: Declare GONegotiation signals properly

Change-Id: I54a598ae249ca569f15eaef8f728985897e1b2f0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/hostapd.c
rc/common/tnc.h
rc/crypto/crypto.h
rc/crypto/crypto_internal-rsa.c
rc/eap_peer/tncc.c
rc/eap_server/tncs.c
rc/tls/asn1.c
rc/tls/asn1.h
rc/tls/pkcs1.c
rc/tls/pkcs1.h
rc/tls/rsa.c
rc/tls/rsa.h
rc/tls/x509v3.c
rc/utils/eloop.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/android.config
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/defconfig
6dc03bd757d3befd2c03a543a402338db03914d6 16-May-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit b19c098e75d1dfa681960d9656d36001464a746e

b19c098 Send authentication failure reason in wpas_auth_failed()
5cd0e22 P2P: Iterate through full pref_chan list in search of a valid channel
f41d55d hostapd: Check for overlapping 20 MHz BSS before starting 20/40 MHz BSS
5516ed3 WPS: Deinit before wpas_p2p_disconnect()
c70c375 SCARD: Fix GSM authentication on USIM
c78c6b7 WPS: Fix return value when context is not valid
388444e P2P: Modify the timeout for GO Negotiation on no concurrent session
7e68be3 P2P: Refrain from performing extended listen during PD
e9eb648 P2P: Reject P2P_FIND and P2P_LISTEN on disabled interface
c71c241 P2P: Clear P2P state if active interface is disabled
ad12f2f Add DRIVER_EVENT ctrl_iface command for testing purposes
3e66f78 P2P: Make sure GO start does not miss connect_without_scan
c7caac5 nl80211: Fix send_frame freq for IBSS
28fa4eb P2P: Fix scan optimization for GO during persistent group invocation

Change-Id: I5b4d46322641de1a2d87e50a7f5fdc97f2f30c38
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/hw_features.c
rc/ap/wps_hostapd.c
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_utils.c
rc/utils/pcsc_funcs.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
684785c7f4e58498603a9a5ce26f933cc2557ebd 12-May-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 7b42862ac87f333b0efb0f0bae822dcdf606bc69

7b42862 P2P: Validate GO operating channel on channel list changes
fb2ac53 Remove leftover timeouts on cleanup
1c330a2 Add 'dup_network <id_s> <id_d> <name>' command
316f92c dbus: Reorder deauthentication and cleanup calls when removing a network

Change-Id: I7283a61ed5044c884a728fe0b75199dac8552599
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_common.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/hs20_supplicant.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wps_supplicant.c
5a1480c7c46c4236d93bfd303dde32062bee04ac 12-May-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit f4626235de4b6d19c7399a2522241f7c43e0caf6

f462623 EAP-pwd server: Allow fragment_size to be configured
c876dcd EAP-IKEv2: Allow frag ack without integrity checksum
0f73c64 EAP-pwd: Fix processing of group setup failure
13e2574 EAP-pwd peer: Export Session-Id through getSessionId callback
cfdb32e eapol_test: Check EAP-Key-Name
251c53e RADIUS: Define EAP-Key-Name
04cad50 EAP-SIM peer: Fix counter-too-small message building
270c9a4 Interworking: Allow FT to be used for connection
81ed499 Remove duplicated ibss_rsn_deinit() call
144f104 X.509: Fix v3 parsing with issuerUniqueID/subjectUniqueID present
0f1034e P2P: Refrain from performing extended listen during P2P connection
8d0dd4e Add macsec_qca driver wrapper
dd10abc MACsec: wpa_supplicant integration
887d9d0 MACsec: Add PAE implementation
7baec80 MACsec: Add driver_ops
4e9528c MACsec: Add common IEEE 802.1X definitions
3bcfab8 MACsec: Add define for EAPOL type MKA
0836c04 MACsec: Allow EAPOL version 3 to be configured
49be483 Add function to fetch EAP Session-Id from EAPOL supplicant
ea40a57 nl80211: Use max associated STAs information in AP mode

Change-Id: I0e37a10ca58d0dc1be95a0088d6a4c37b2505ad4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/Makefile
rc/common/eapol_common.h
rc/common/ieee802_1x_defs.h
rc/drivers/driver.h
rc/drivers/driver_macsec_qca.c
rc/drivers/driver_nl80211.c
rc/drivers/drivers.c
rc/drivers/drivers.mak
rc/eap_common/eap_pwd_common.c
rc/eap_common/eap_pwd_common.h
rc/eap_peer/eap_ikev2.c
rc/eap_peer/eap_pwd.c
rc/eap_peer/eap_sim.c
rc/eap_server/eap_server_ikev2.c
rc/eap_server/eap_server_pwd.c
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/pae/Makefile
rc/pae/ieee802_1x_cp.c
rc/pae/ieee802_1x_cp.h
rc/pae/ieee802_1x_kay.c
rc/pae/ieee802_1x_kay.h
rc/pae/ieee802_1x_kay_i.h
rc/pae/ieee802_1x_key.c
rc/pae/ieee802_1x_key.h
rc/pae/ieee802_1x_secy_ops.c
rc/pae/ieee802_1x_secy_ops.h
rc/radius/radius.c
rc/radius/radius.h
rc/tls/x509v3.c
pa_supplicant/Makefile
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/driver_i.h
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wpas_kay.c
pa_supplicant/wpas_kay.h
15f1742631bd80013697505636721d34482d4d6b 30-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> am db7ba1d8: am fee4d79f: am d28183c0: Merge "Android: Use external libnl 2.0 dynamic library"

* commit 'db7ba1d8a75064110e0f568b12ad443cfaebb6d2':
db7ba1d8a75064110e0f568b12ad443cfaebb6d2 30-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> am fee4d79f: am d28183c0: Merge "Android: Use external libnl 2.0 dynamic library"

* commit 'fee4d79fc4a9a9dbc769d4804a54edbb9e303a96':
b58836ed5520bf4b769f76ef7dcb802af8c900b8 29-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 2cebdee66de6a1c6befe327c2348610478e06032

2cebdee Fix MinGW build
e4fa8b1 wpa_supplicant: Add Wake-on-WLAN configuration support
959214b Android: Use extended P2P functionality (ANDROID_P2P) for all vendors
9a41232 TDLS: Fully tear down existing link before setup
c04b465 TDLS: Disable links during AP deauth in external flow
b19719a TDLS: Make wpa_tdls_send_teardown() static
52f5877 nl80211: Take ownership of dynamically added interfaces
e390df0 nl80211: Cancel rfkill timeout on deinit
fa258a3 HS 2.0 R2: Fix writing of domain_suffix_match cred parameter
bb24229 TDLS: Pass peer's capability info to the driver in open mode

Change-Id: I20b4dba96c07a85cf7b9c9c4ae51bbf9f6f88540
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
pa_supplicant/Android.mk
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
pa_supplicant/wpa_supplicant.c
7832adbbd72a1b784b7fb74a71a5d4085b0cb0d3 29-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit c0333c8dd59b9e254d3fc725c984b1c0cd3d496a

c0333c8 Check rx_mgmt::frame more consistently against NULL
d6c6b1f Make sta NULL-check easier for static analyzers
0bceb8d Make dl_list_first() and dl_list_last() uses easier for static analyzers
5f693cb WPS HTTP: Remove unused assignment
ee4fefc Remove duplicated variable zeroing
4a9d0eb Make PMKID check easier for static analyzers
06df2aa Remove floating constant suffix 'd' from test coee
9670f87 ACS: Clean up ifdef CONFIG_ACS to avoid unreachable code
ece88f7 Make last_scan_res update easier for static analyzers
d06e9ac P2P: Verify operating channel validity for NFC connection handover
13a524a nl80211: Remove unnecessary wpa_driver_nl80211_set_freq() wrapper
e87ef75 nl80211: Add support for changing AP mode channel bandwidth
3057518 Sync with mac80211-next.git nl80211.h
5f0bca7 Retry initial 20/40 MHz co-ex scan if the driver is busy
587d60d Add AP mode support for HT 20/40 co-ex Action frame
9c47f6a hostapd: Extend support for HT 20/40 coexistence feature
196c9c7 Make channel parameters available in set_ap() driver operation
b7a6702 Indicate disconnection event on interface disabled
b89962b Fix wpa_config_read() with existing config block
27b4187 WPS: Print setsockopt() failure in debug log
52cb207 trace: Replace demangle.h with internal defines
0e80ea2 nl80211: Fix some coding style issues
a26582c Make qca-vendor.h independent of other header files
4a64d5a nl80211: Allocate QCA vendor subcmd for extended statistics

Change-Id: Ibabee77b2b87f04f99d6b1ca0f1ac741cb9222c0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
rc/ap/ap_config.c
rc/ap/beacon.c
rc/ap/ctrl_iface_ap.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/hw_features.h
rc/ap/ieee802_11.c
rc/ap/ieee802_11.h
rc/ap/ieee802_11_ht.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth_ie.c
rc/common/ieee802_11_defs.h
rc/common/qca-vendor-attr.h
rc/common/qca-vendor.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/driver_test.c
rc/drivers/nl80211_copy.h
rc/p2p/p2p.c
rc/utils/trace.c
rc/wps/http_server.c
rc/wps/httpread.c
rc/wps/wps_upnp_ssdp.c
rc/wps/wps_upnp_web.c
pa_supplicant/bss.c
pa_supplicant/config_file.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
f9bdef99ce3b2858f2812c745a3d6bb093fb0e5d 25-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit d0df64373561a8804c35e1900e5857096f5b73d8

d0df643 wpa_supplicant: Call frequency conflict handling during auth
0cf24fd scan: Reset normal scan counter when a connection succeeds
dcdce14 radiotap: Fix compilation for systems without le16toh/le32toh
9176ec0 Android: Disable unused parameter warnings
2aa82e5 Interworking: Don't filter probe requests when interworking is disabled
13f6a07 Add SIM identifier to the network profile and cred block

Change-Id: I9135d23aea91ca2950b5eeefa9f81c38ab1ff4d1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
rc/ap/beacon.c
rc/common/qca-vendor.h
rc/eap_peer/eap_config.h
rc/utils/platform.h
pa_supplicant/Android.mk
pa_supplicant/README-HS20
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/interworking.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
61593f02176862f4880ddefcb1f54cb5f5d9f043 22-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 0f3bf6135d9e5d5e50de46c4755de0864f6c66

0f3bf61 AP: Fix checking if DFS is required
d41cc8c Allow HT 40 MHz intolerant flag to be set for association
6d99bd8 nl80211: Debug print HT/VHT capability override information
f777fd1 Fix writing of provisioning_sp cred parameter
d2c33b9 Reduce the amount of time PTK/TPTK/GTK is kept in memory
a7ca6da Fix P2P redirection of global ctrl_iface SET command
d6b818e Remove SAVE_CONFIG redirect from global control interface
128cc37 eap_proxy: Use unique Makefile names for Android and non-Android
e83e15e P2P: Fix interface remove to terminate all P2P groups
e47ee24 l2_packet: Fix l2_packet_none (hostapd default)

Change-Id: Ib336ce383695ce9ce662465d91c6bc82496db153
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/dfs.c
rc/common/qca-vendor.h
rc/drivers/driver_nl80211.c
rc/l2_packet/l2_packet_none.c
rc/rsn_supp/wpa.c
pa_supplicant/Makefile
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/ctrl_iface.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
7dba0e5708da7276a43a44cf479aa743564e15b9 14-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit bacb984b2d10c0dccb3b05b7779d5d4c5662e8b2

bacb984 radiotap: Update radiotap parser to library version
e9b32da Propagate scan failures over D-Bus
142817b Add a wpa_supplicant ctrl_iface event for regdom changes
150fd0b WPS: Split eapol_cb reconnect to a separate code path
ded4f94 WPS: Close p2p_group and temporary parameters to all network blocks
d6a36f3 nl80211: Mask out deauth even after own deauth request
e74dd0e Add forgotten ampdu_factor into wpa_supplicant.conf
759ff2f Re-enable use of wildcard SSID with passphrase
023b466 Fix a debug print to have a space between words
0cd8602 Add CTRL-EVENT-SIGNAL-CHANGE for bgscan signal update events
bd8838a Fix ctrl_iface BLACKLIST return value

Change-Id: I4099b6a33f062d2b6a74c995941a2c534df90b3e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/qca-vendor.h
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/utils/platform.h
rc/utils/radiotap.c
rc/utils/radiotap.h
rc/utils/radiotap_iter.h
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.h
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/events.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wps_supplicant.c
413dde71f7bc166de54229f337c24b61f4d909fd 11-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit f3ff948753ebe5643b5c2d16546a4d16e2c9d20a

f3ff948 P2P: Add NFC_HANDOVER commands to p2p_redir list
efd11c0 Add reassociate command to dbus doxygen
481e66b Fix reassociate dbus method
2150c33 wpa_cli: Fix wrong comparison in wpa_cli_cmd_interface
83c4cb5 nl80211: Handle multiple interface combinations for P2P
0133591 HS 2.0 SPP server: Fix aaa_trust_root_cert_url example to use DER
0e0e1e5 P2P: Add retry mechanism for GO Negotiation Confirmation
8235f89 P2P: Mark the scan in p2p_in_invitation as p2p_probe
9392c9b nl80211: Use LEAVE_IBSS with driver-based-SME
38ce8e2 Android: Add qca-vendor.h to be exported

Change-Id: I34771c58e2de5e0a3133326d4b3171341ac07b17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
s20/server/sql-example.txt
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
pa_supplicant/Android.mk
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.h
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/scan.c
pa_supplicant/wpa_cli.c
26af48b2fcdee1b88e4092a9078cb7c9bf79da6e 09-Apr-2014 Jouni Malinen <jouni@qca.qualcomm.com> OpenSSL: Detect and prevent TLS heartbeat attack

Some OpenSSL versions have vulnerability in TLS heartbeat request
processing. Check the processed message to determine if the attack has
been used and if so, do not send the response to the peer. This does not
prevent the buffer read overflow within OpenSSL, but this prevents the
attacker from receiving the information.

This change is an additional layer of protection if some yet to be
identified paths were to expose this OpenSSL vulnerability. However, the
way OpenSSL is used for EAP-TLS/TTLS/PEAP/FAST in hostapd/wpa_supplicant
was already rejecting the messages before the response goes out and as
such, this additional change is unlikely to be needed to avoid the
issue.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
rc/crypto/tls_openssl.c
f940fbdc849eba19de7b63a74ced85e550bf4572 10-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 897a5ccee83090b837aad63b81dbc4d0e77d06f5

897a5cc WNM: Remove unnecessary present flag
f6ce70d WNM: Fix neighbor report subelement formats
e9cb7b9 WNM: Fix neighbor report subelement parser to not leak memory
1aa6f95 WNM: Fix neighbor report subelement parser
5583b8d Document and rename HT Capability/Operation fields
1dde5b5 Remove PSMP option from ht_capab

Change-Id: I0a0a00d2c411f57830098430e59c2a758ab87d7f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.conf
rc/ap/hw_features.c
rc/ap/ieee802_11_ht.c
rc/common/ieee802_11_defs.h
pa_supplicant/wnm_sta.c
pa_supplicant/wnm_sta.h
21de214b4ba4271ca20843f3b8fba9f1501b2a89 08-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 4a16a0bd550401a50dedfcf701f6dcc7a3598133i

4a16a0b nl80211: Add QCA vendor subcmd for NAN
f8b10c1 Fix CONFIG_AP=y build without CONFIG_P2P=y
f05cee9 P2P: Clear p2p_in_invitation on cancel
ec331d0 WNM: Fix deinit path to clean neighbor report count
679f2e7 WPS NFC: Remove NFC_RX_HANDOVER_SEL
dc39004 WPS: Remove unused WEP related functionality
9437c2d EAP-pwd peer: Fix fragmentation of PWD-Confirm-Resp
48f668e EAP-pwd: Fix memory leak on error path with fragmentation
9ff4de6 Move DROP_SA command to be within ifdef CONFIG_TESTING_OPTIONS
e1a273a Remove used KDE addition code from EAPOL-Key msg 4/4
9a147ba WNM: Fix regression in Sleep Mode exit key data parsing
76d3fb1 Remove unused wpa_sm_get_param() function
ed42993 TDLS: Add test mode for MIC failure testing
5784b9a Fix memory leaks in hostapd configuration updates

Change-Id: I7f1ec783ac791e06178f9c8b9be9119ac46aa745
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
rc/ap/wps_hostapd.c
rc/common/qca-vendor.h
rc/eap_peer/eap_pwd.c
rc/eap_peer/eap_wsc.c
rc/eap_server/eap_server_pwd.c
rc/rsn_supp/peerkey.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/wps/wps_defs.h
rc/wps/wps_registrar.c
pa_supplicant/README-WPS
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wnm_sta.c
pa_supplicant/wpa_cli.c
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
0cfd5f779f6cdd2f774a27bb1dec95d3940cd16a 04-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 204c9ac4eed9f0ad69497f2efcd0d095dfd6e61c

204c9ac Extend select_network command with freq= to reduce scan time
6a6afc0 Fix radius_example build
75aea3e Interworking: Add writing of forgotten cred parameters into config file
c880ab8 Interworking: Add GET_CRED ctrl_iface command
1619e9d Interworking: Add ctrl_iface events on cred block modifications

Change-Id: I1944c63f5e0debfc465d6852aa908748c227303a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/wpa_ctrl.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/wpa_cli.c
df5a7e4c5c64890c2425bb47d665bbce4992b676 02-Apr-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 39a5800f7c2a9de743c673a78929ac46a099b1a4

39a5800 wpa_supplicant: Allow disabling LDPC
7230040 Interworking: Read IMSI if not read at supplicant start
62f736d Interworking: Init scard when a credential requires SIM access
729897a Interworking: Fix incorrect compile PCSC flag
21611ea edit: Increase buffer size to 4096 bytes
0b2c59e OSU server: Add example scripts for Hotspot 2.0 PKI
0f27c20 HS 2.0R2: Add example OSU SPP server implementation
1e03c6c XML: Remove forgotten, unused definition of debug_print_func
5cfc87b Make hs20_wan_metrics parser error print more helpful
4be20bf Fix validation of anqp_3gpp_cell_net configuration parameter
23587e3 Remove duplicated vht_capab parser entry
18a8e55 Notify STA of disconnection based on ACL change
8943cc9 RADIUS server: Add support for MAC ACL
dc87541 Clean up debug print for PSK file search
bbbacbf DFS: Print CAC info in ctrl_iface STATUS command
ace0fbd P2P: Fix segfault when PBC overlap is detected
cf15b15 Add writing of network block ocsp parameter
5c9da16 nl80211: Set all BSS interfaces down when tearing down AP in MBSS mode
f1c4dbf wpa_supplicant: Remove pending sme-connect radio work
4f560cd wpa_supplicant: Override HT A-MPDU size if VHT A-MPDU was overridden
3ae8b7b hostapd: Add vendor command support
782e2f7 P2P: Do not initiate scan on P2P Device when enabled
74a1319 Fix issue with incorrect secondary_channel in HT40/HT80
96ecea5 Pass TDLS peer capability information in tdls_mgmt
78cd7e6 Sync with wireless-testing.git include/uapi/linux/nl80211.h
b36935b nl80211: Fix EAPOL frames not being delivered
6997f8b nl80211: Set interface address even if using old interface
9b4d9c8 nl80211: Print if_indices list in debug log
762c41a eloop: Add assert() on negative fd when using select() code path
978c673 Add a note on using 'iw list' to determine multi-BSS support

Change-Id: I89af7f8d92ed706c8909ed3cc9c49d6e1277a2b0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/hostapd.conf
ostapd/hostapd_cli.c
s20/server/Makefile
s20/server/ca/clean.sh
s20/server/ca/est-csrattrs.cnf
s20/server/ca/est-csrattrs.sh
s20/server/ca/hs20.oid
s20/server/ca/ocsp-req.sh
s20/server/ca/ocsp-responder-ica.sh
s20/server/ca/ocsp-responder.sh
s20/server/ca/ocsp-update-cache.sh
s20/server/ca/openssl-root.cnf
s20/server/ca/openssl.cnf
s20/server/ca/setup.sh
s20/server/ca/w1fi_logo.png
s20/server/hs20-osu-server.txt
s20/server/hs20_spp_server.c
s20/server/spp_server.c
s20/server/spp_server.h
s20/server/sql-example.txt
s20/server/sql.txt
s20/server/www/add-free.php
s20/server/www/add-mo.php
s20/server/www/cert-enroll.php
s20/server/www/config.php
s20/server/www/est.php
s20/server/www/free-remediation.php
s20/server/www/free.php
s20/server/www/redirect.php
s20/server/www/remediation.php
s20/server/www/signup.php
s20/server/www/spp.php
s20/server/www/users.php
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/authsrv.c
rc/ap/ctrl_iface_ap.c
rc/ap/dfs.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/ieee802_1x.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/nl80211_copy.h
rc/eap_server/eap.h
rc/radius/radius.c
rc/radius/radius.h
rc/radius/radius_server.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/utils/edit.c
rc/utils/edit_simple.c
rc/utils/eloop.c
rc/utils/xml-utils.h
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/driver_i.h
pa_supplicant/events.c
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
15907098d1f67c24bb000e593e279af173cf57d7 25-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit cf28c66bcb8883e6be921d6406a534e4a5b45b96

cf28c66 HS 2.0: Extend ANQP_GET to accept Hotspot 2.0 subtypes
163f801 nl80211: Indicate HS 2.0 OSEN AKM in connect/associate command
c201f93 WPS: Enable WSC 2.0 support unconditionally
91364b7 P2P: Set a timeout for a persistent reinvoke on a P2P Client
41d5ce9 P2P: Optimize scan for GO during persistent group invocation
4d1e38b ACS: Fix number of error path issues

Change-Id: I31a51d3dba055d1a906516bb08894effec327da9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/README-WPS
ostapd/android.config
ostapd/defconfig
rc/ap/acs.c
rc/ap/ap_config.c
rc/ap/ap_drv_ops.c
rc/ap/hostapd.c
rc/ap/wps_hostapd.c
rc/common/ieee802_11_defs.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_invitation.c
rc/wps/wps.c
rc/wps/wps_attr_build.c
rc/wps/wps_common.c
rc/wps/wps_defs.h
rc/wps/wps_enrollee.c
rc/wps/wps_er.c
rc/wps/wps_registrar.c
rc/wps/wps_upnp_ap.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README-WPS
pa_supplicant/android.config
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/defconfig
pa_supplicant/events.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/hs20_supplicant.h
pa_supplicant/interworking.c
pa_supplicant/interworking.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
d11f019d62a42a8fc4c4d1f2ec17cf35b0763153 24-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 31ded52e7084976c5f84caae6cb55e632dd8b013

31ded52 SME: Add more debug prints for OBSS scans and 20/40 MHz co-ex report
7f8eb34 SME: Fix OBSS scan result processing for 20/40 MHz co-ex report
b7a8d67 Allow hostapd to advertise 40 MHz intolerant HT capability
692ec30 FT: Add support for postponing FT response
6ace13a P2P: Clean up channel selection code to use helper functions
70c3523 WPS: Comment out unused AP WEP config write with WPS 2.0
c3ba70f P2P: Update op_reg_class in random social channel case
70634ee hostapd: Check driver DFS offload capability for channel disablement
65d645c nl80211: Fetch DFS offload capability from driver
a500f31 WPS: Comment out unused AP WEP config update with WPS 2.0
be4e5af Add SAE and FT-SAE key_mgmt to hostapd GET_CONFIG
1d4fe3b Remove unnecessary parameter validation
94b84bc P2P: Avoid unsafe pre-configured channel as channel preference
d3c9c35 Add freq= parameter to 'set pno' command
b998236 dbus: Implement P2P Peers info IEs buffer getter
c6f356f dbus: Export the peer's device address as a property
442adfd dbus: Declare properly ServiceDiscoveryRequest method
8903741 dbus: Cancelling a service request always reply by an error
13494c4 dbus: Remove duplicate signal declaration
513dcec Don't overwrite channel on hostapd config reload
5eae87a P2P: Fix GO failed interface init
c46235a wpa_supplicant: Fix radio_remove_interface
2ce7e4f Android: Enable CONFIG_EAP_AKA_PRIME option
95bf699 Add get_radio_name() driver wrapper for wpa_supplicant
d06ecab D-Bus: Make p2p_no_group_iface configurable
8b6b6d8 Fix hostapd.conf description of HT40+

Change-Id: I5e776f71050a106195a39e96d0c38930a387a806
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/hostapd.conf
rc/ap/ctrl_iface_ap.c
rc/ap/hostapd.c
rc/ap/hw_features.c
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_ft.c
rc/ap/wpa_auth_i.h
rc/ap/wps_hostapd.c
rc/common/qca-vendor.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/p2p/p2p_utils.c
pa_supplicant/android.config
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/dbus/dbus_new_handlers_p2p.h
pa_supplicant/driver_i.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
6cb1f6521a84955752c2b99100cf1df87637f86c 21-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 20ff2642e192437245422c9654463bcebf65b277

20ff264 WPS: Clear WPS data on init failure
f19e370 WPS: Do not advertise WPA/WPA2-Enterprise Auth Type Flags
1b5df9e nl80211: Do not indicate scan started event on scan_for_auth
bb23826 HS 2.0R2: Clean up debug log during exit path
48408fc HS 2.0R2: Do not mandate OCSP response for EST operations
8f60293 HS 2.0R2: Do not use OSU cert validation for EST
40bdcea HS 2.0R2: Configure OSU client trust root more consistently
4d65ded HS 2.0R2: Clean up debug from libcurl

Change-Id: I44aa20ac92abf03ea7b47f1ecad72dc07a0870d9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
s20/client/est.c
s20/client/oma_dm_client.c
s20/client/osu_client.c
s20/client/osu_client.h
s20/client/spp_client.c
rc/ap/wps_hostapd.c
rc/drivers/driver_nl80211.c
rc/utils/http_curl.c
rc/wps/wps_attr_build.c
b36ed7cd946148d829f311de8fe53ea3ffaaffe3 17-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit f4e3860f8a770a0db3816196c77baf894c7ccc1e

f4e3860 Fix AP mode default TXOP Limit values for AC_VI and AC_VO
47bd94a TLS testing: Add new test cases for RSA-DHE primes
f5bbb2f TLS client: Reject RSA-DHE prime if it shorter than 768 bits
817742f TLS testing: Fix test_flags check for ApplData report
1120e45 Allow config blobs to be set through ctrl_iface
c3722e1 ACS: Fix VHT20
49b7443 Fix HT40 co-ex scan for some pri/sec channel switches
5bdac4a Remove unused STA entry information
c9d9ee9 Fix hostapd_add_iface error path to deinit partially initialized BSS
6829da3 Fix external radio_work deinit path
8dd9f9c Allow management group cipher to be configured
67d39cf P2P: Do not create another group interface on NFC Token enable
6aa1cd4 wpa_supplicant: Apply VHT_OVERRIDES to wpas_start_assoc_cb()
db63757 hostapd: Supply default parameters for OBSS scan
6e9375e TDLS: Add get_capability tdls command
67e1a40 hostapd: For VHT 20/40, allow center segment 0 to be zero
d0bf06f GAS server: Remove incomplete remote ANQP processing
fdb4535 WPS: Extend per-station PSK to support ER case as well
9a1a538 wpa_supplicant AP: Allow PMF to be enabled with ieee80211w
ce6b9cd Allow reason code to be specified for DEAUTH/DISASSOC test frame
dda8be7 TDLS: Use QoS info from WMM IE obtained in TDLS frames
daa70bd Fix CONFIG_NO_SCAN_PROCESSING=y build
3a8ec73 P2P: Report dev_found event (if not yet done) from GO Neg Req RX
0f23a5e Mark AP disabled if initialization steps fail

Change-Id: I7e499241552147c734fec9b77351b47ffd6e3a7c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.conf
rc/ap/acs.c
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_mlme.c
rc/ap/ctrl_iface_ap.c
rc/ap/gas_serv.c
rc/ap/gas_serv.h
rc/ap/hostapd.c
rc/ap/hw_features.c
rc/ap/iapp.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11_ht.c
rc/ap/ieee802_11_shared.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_i.h
rc/ap/wpa_auth_ie.c
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/crypto/tls.h
rc/p2p/p2p_go_neg.c
rc/radius/radius_server.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
rc/tls/tlsv1_client_read.c
rc/tls/tlsv1_server.c
rc/tls/tlsv1_server_i.h
rc/tls/tlsv1_server_read.c
rc/tls/tlsv1_server_write.c
rc/wps/wps_enrollee.c
rc/wps/wps_i.h
rc/wps/wps_registrar.c
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
d5dc24eb5fbf0e0feff214c0260cae845721d5fe 12-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 39b420f7b12b152f879d1bb8a5267b9a838e04dc

39b420f HS 2.0R2: Add parse_cert command for debugging purposes
c0d701a HS 2.0R2: Add OSU client implementation
d2bb2b4 Add os_file_exists()
1cb3eda HS 2.0R2: Add wrapper functions for libcurl
2cb8f96 HS 2.0R2: Add wrapper functions for libxml2
da4ec2c HS 2.0R2: Add wrapper for system browser
db3ca20 HS 2.0R2: Add wrapper for wpadebug browser on Android
2a10e57 HS 2.0R2: Add wrapper for Android browser for user interaction
d0b79d7 HS 2.0R2: Add wrapper functions for WebKit
91728f2 Add wpa_ctrl helper functions for upper level functionality
b4c26ef Clean up hostapd_config_fill() parsers
b2e32cd Fix memory leaks on wpa_config_parse_string() error paths
a0b728b Simplify hostapd_config_fill() error reporting
599f40d Remove extra indentation level from hostapd_config_fill()

Change-Id: I17b7089210da7e083c9fe5814e79cef99bbee80b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
s20/client/Android.mk
s20/client/Makefile
s20/client/devdetail.xml
s20/client/devinfo.xml
s20/client/est.c
s20/client/oma_dm_client.c
s20/client/osu_client.c
s20/client/osu_client.h
s20/client/spp_client.c
rc/common/wpa_helpers.c
rc/common/wpa_helpers.h
rc/utils/browser-android.c
rc/utils/browser-system.c
rc/utils/browser-wpadebug.c
rc/utils/browser.c
rc/utils/browser.h
rc/utils/http-utils.h
rc/utils/http_curl.c
rc/utils/os.h
rc/utils/os_unix.c
rc/utils/xml-utils.c
rc/utils/xml-utils.h
rc/utils/xml_libxml2.c
9866086a955d00e237cc8df3722e7dff75c02532 12-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 99cd77a8c50413d44f1ebead917310468a8406de

99cd77a tests: Verify reassociate-to-same-BSS commands
e8d70a7 nl80211: Hide deauth event due to forced deauth-during-auth
0f44ec8 Add a reattach command for fast reassociate-back-to-same-BSS
cfc393a hostapd: Document interworking realm EAP Method types
7450c12 DFS: Add extra debugging messages
5d0d72a wpa_supplicant: Put upper bound on initial scan time delay
8c06db7 nl80211: Fix P2P Device handling when starting with RF-kill blocked
5e3ddf4 PNO: Change sched_scan_stopped event to handle pending PNO properly
737e7a0 PNO: Move and rename pno_start()/pno_stop()
1d91f50 hostapd: Process management frames only once per BSS
e070051 hostapd: Allow to switch to usable DFS channels
01b9999 hostapd: Allow to switch to DFS channels if available
70ee1be hostapd: Add config option chanlist for DFS channels
09eef14 Use internal FIPS 186-2 PRF if needed
3b9c517 Fix PTK derivation for CCMP-256 and GCMP-256
e6ef73f nl80211: Add debug print of KEY_DATA and KEY_SEQ
b465f5d Remove unused hostapd_wep_key_cmp()
4fb363c Fix error path handling on radius_accept_attr

Change-Id: I28ecac6cbcc6f71f19a051c12b54668ca6a66e2a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/config_file.c
ostapd/hostapd.conf
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/dfs.c
rc/ap/drv_callbacks.c
rc/ap/wpa_auth.c
rc/crypto/Makefile
rc/crypto/fips_prf_cryptoapi.c
rc/crypto/fips_prf_gnutls.c
rc/crypto/fips_prf_nss.c
rc/crypto/sha1-internal.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/rsn_supp/wpa.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/events.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
fee4d79fc4a9a9dbc769d4804a54edbb9e303a96 11-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> am d28183c0: Merge "Android: Use external libnl 2.0 dynamic library"

* commit 'd28183c0c33f5ee3876b49ce24cad01f701b6742':
Android: Use external libnl 2.0 dynamic library
818ea489ef32dcdc7c098d8a336d6e1dd8996112 10-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 390b92913a9a1b3a6aaf70e8b5971a7b7c76cabc

390b929 TLS testing: Allow hostapd to be used as a TLS testing tool
994afe3 RADIUS server: Allow TLS implementation add log entries
01f7fe1 RADIUS server: Allow EAP methods to log into SQLite DB
8a57da7 RADIUS server: Add option for storing log information to SQLite DB
f3ef7a2 TLS client: Send decrypt_error on verify_data validation error
129b9b9 TLS: Share a helper function for verifying Signature
6531963 TLS: Use a helper function for calculating ServerKeyExchange hash
65074a2 TLS: Add support for DHE-RSA cipher suites
41ebfe9 TLS server: Enable SHA256-based cipher suites
60b893d wpa_supplicant: Allow external management frame processing for testing
ec33bc6 Enable RADIUS message dumps with excessive debug verbosity
226e357 Revert "bridge: Track inter-BSS usage"
d0ee16e Allow arbitrary RADIUS attributes to be added into Access-Accept
0ac3876 Fix PMF protect disconnection on session timeout
49021c1 Fix hostapd error path regression

Change-Id: Ie0710c036cca2fb370d28684cc5a5d28a075dfc1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.eap_user
ostapd/hostapd.eap_user_sqlite
ostapd/main.c
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/authsrv.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/sta_info.c
rc/ap/vlan_init.c
rc/crypto/tls.h
rc/crypto/tls_internal.c
rc/eap_server/eap.h
rc/eap_server/eap_i.h
rc/eap_server/eap_server.c
rc/eap_server/eap_server_identity.c
rc/eap_server/eap_server_mschapv2.c
rc/eap_server/eap_server_tls_common.c
rc/eap_server/eap_server_ttls.c
rc/eapol_auth/eapol_auth_sm.c
rc/radius/radius_server.c
rc/radius/radius_server.h
rc/tls/tlsv1_client.c
rc/tls/tlsv1_client_read.c
rc/tls/tlsv1_client_write.c
rc/tls/tlsv1_common.c
rc/tls/tlsv1_common.h
rc/tls/tlsv1_server.c
rc/tls/tlsv1_server.h
rc/tls/tlsv1_server_i.h
rc/tls/tlsv1_server_read.c
rc/tls/tlsv1_server_write.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/wpa_supplicant_i.h
2ac5f6049e74103a8fe8e9c78b330020081d7df4 07-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit c16a7590cfe76d5895ac70ef711e5b0b384f7aa6

c16a759 wpa_supplicant: Add a configuration file for the P2P_DEVICE parameters
185677b Disable interface if ACS fails
8f05577 Configure beacon interval for IBSS command
95faa36 HS 2.0R2: Check for OSEN when determining whether to authorize STA
113318a Set the station to authorized on assoc event for open authentication

Change-Id: Id8111b6475bf93a0600a431708cb16120d380e24
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/acs.c
rc/ap/hostapd.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
pa_supplicant/README
pa_supplicant/main.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
a38abf9af7bec7e89dbfb39ac7bb77223fe47c72 06-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 905828fea4b95a6d48ce86e1b5272c25a618b3d8

905828f hostapd: Fix vht_capab 'Maximum A-MPDU Length Exponent' handling
89de64c ACS: Fix VHT80 segment picking
1f37483 DFS: Print error in case CAC fails
354c903 AP/GO interface teardown optimization
8bc4372 Use P2P_IE_VENDOR_TYPE more consistently
8714caa WPS: Parse Registrar Configuration Methods
6b9f7af nl80211: Extend the new vendor command for testing nl80211
3a94adb P2P: Do not start scan for P2P Device interfaces at driver init
aa10983 P2P: Do not initialize bgscan on P2P interfaces
819f096 nl80211: Fix RTM event handling for dynamic interfaces
54ac5aa config: Add bgscan option when saving global configuration
268043d bgscan: Do not initialize bgscan if disabled by user
adef894 nl80211: Add vendor command support
d0595b2 nl80211: Fix tearing down WDS STA interfaces

Change-Id: I6d49f445692b71a4cd324f517eba651518ee14bb
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/main.c
rc/ap/acs.c
rc/ap/ap_drv_ops.c
rc/ap/ap_mlme.c
rc/ap/ctrl_iface_ap.c
rc/ap/dfs.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/p2p_hostapd.c
rc/ap/sta_info.c
rc/common/ieee802_11_defs.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_build.c
rc/p2p/p2p_sd.c
rc/wps/wps_attr_parse.c
rc/wps/wps_attr_parse.h
rc/wps/wps_defs.h
pa_supplicant/ap.c
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
7d5c8f257a74ac0d12828962a492e8b84ef83923 03-Mar-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 5f7e1c06cd428888a2ed4fa763c5da37a873e422

5f7e1c0 Redirect more frames with ext_mgmt_frame_handling=1
7738163 RADIUS server: Copy IPv4 address only when IPv6 is not used
508e24c dbus: Clean up error reporting for TDLS peer address parsing
3b6170b WPS: Remove duplicate variable setting
78789d9 Remove unnecessary variable initialization
a7c37d9 dbus: Remove duplicated variable assignment
e997bc7 Remove a static analyzer warning about unused variable write
ea3b8c1 Do not use a separate variable for tracking first entry in a list
8a4ce28 WPA: Clean up cipher suite counting in write routines
6ed626d Remove unused gid_str pointer update
749fa14 Debug print trailing WPA/RSN IE bytes, if any
a5802c0 OpenSSL: Avoid never-used analyzer warning
7b6e815 Clean up hostapd add_iface error path operations
67adcd2 WNM: Check wpa_s->current_bss more consistently
3ff8073 EAP-FAST: Use clear eap_get_config() result validation
a8716d1 roboswitch: Verify that register read succeeds before comparing res
3d91a04 DFS: Make sure center frequency is always initialized for VHT
fa0a9f5 trace: Fix memory use on no-function name path
bd27b13 Make code path easier for static analyzers
64abb72 nl80211: Allow old r-o-c offchannel TX to be tested
fa72a88 P2P: Fix validation on Invitation Request error path
ca412c7 Remove unreachable return statement
2af4d87 GAS: Fix additional comeback delay with status code 95
07d462c Interworking: Remove unused password setting for SIM credential
3141b82 Add OSEN to proto config field writer
b908c50 Clear hostapd bss entry to NULL on add-interface-failure
0052ce4 atheros: Add support for OSEN

Change-Id: Ifd78a8f8259e5b0f654d3dbadd24c9ab029d3afb
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/dfs.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hw_features.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11_ht.c
rc/ap/peerkey_auth.c
rc/common/ieee802_11_defs.h
rc/common/wpa_common.c
rc/crypto/tls_openssl.c
rc/drivers/driver_atheros.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_roboswitch.c
rc/drivers/driver_test.c
rc/eap_peer/eap_fast.c
rc/p2p/p2p_invitation.c
rc/radius/radius_server.c
rc/utils/trace.c
rc/wps/ndef.c
rc/wps/wps_upnp_web.c
pa_supplicant/config.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_helpers.c
pa_supplicant/gas_query.c
pa_supplicant/interworking.c
pa_supplicant/wnm_sta.c
4582d2a5dd8180c52eb95b1100fb183b9a289708 28-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 06c7b7f0b5f4deed675a7b81e33830311da7339a

06c7b7f HS 2.0R2: Fix temporary network disabling in Deauth Req case
c5c2d94 P2P: Cancel offchannel TX wait on PD Response TX status
1578796 TDLS: Work around interop issues with supported operating class
b7fb98f Interworking: Fix already-connected check to verify network priority
7c373ac Interworking: Fix last-network preference to not override priority
f54e924 HS 2.0R2: Fix req_conn_capab example

Change-Id: I17953fc05421bc5d454f4081fbfe303f4bf2d6fd
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/p2p/p2p_pd.c
rc/rsn_supp/wpa_ie.c
pa_supplicant/README-HS20
pa_supplicant/events.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/interworking.c
f21452aea786ac056eb01f1cbba4f553bd502747 26-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 5e32f8256f5fcce8b70a95e070375ac549ac935a

5e32f82 tests: Verify HS 2.0R2 deauthentication request
b61e70c HS 2.0R2: Add WFA server-only EAP-TLS server method
8d2a992 HS 2.0R2: RADIUS server support to request Subscr Remediation
ae6d15c HS 2.0R2 AP: Add OSU Providers list ANQP element
f7bd7a0 HS 2.0R2 AP: Add Icon Request and Icon binary File ANQP elements
97596f8 HS 2.0R2 AP: Add support for Session Info URL RADIUS AVP
8e1146d HS 2.0R2 AP: Add support for deauthentication request
a14896e HS 2.0R2 AP: Add OSEN implementation
6ca0853 HS 2.0R2 AP: Use Subscr Remediation request from RADIUS server
7bc9c25 HS 2.0R2 AP: Add STA's Hotspot 2.0 Release Number into Access-Request
76579ec HS 2.0R2 AP: Add AP Hotspot 2.0 Release Number as WFA RADIUS VSA
0dd100f HS 2.0R2 AP: Add definition and helper function for WFA RADIUS VSA
3fb17a9 HS 2.0R2 AP: Add WNM-Notification Request for Subscription Remediation
d5d2478 HS 2.0R2 AP: Update HS 2.0 Indication element to Release 2
a6739e1 HS 2.0R2: Try to scan multiple times for OSU providers
cf6d08a Interworking: Add OCSP parameter to the cred block
6402f2f Interworking: Add more debug info on roaming partner preferences
7479489 Interworking: Add sp_priority cred parameter
751ac99 Interworking: Use a helper function to compare cred priority
aff419f Interworking: Remove separate credential priority tracking
533536d HS 2.0R2: Disable full ESS for as a workaround for per-BSS issues
8a77f1b HS 2.0R2: Slow down connection attempts on EAP failures
76a55a8 HS 2.0R2: Add more debug to network selection
8b4b9fb HS 2.0R2: Fix bandwidth policy BSS selection
28f2a7c HS 2.0R2: Allow excluded network to be selected based on user override
33fb8c5 HS 2.0R2: Add support for Policy/RequiredProtoPortTuple
a45b2dc HS 2.0R2: Add support for Policy/MaximumBSSLoadValue
4cad9df HS 2.0R2: Add support for Policy/MinBackhaulThreshold
aa26ba6 HS 2.0R2: Add tracking of provisioning SP
8e5fdfa HS 2.0R2: Add WFA server-only EAP-TLS peer method
df0f01d HS 2.0R2: Add OSEN client implementation
a5d7563 HS 2.0R2: Add common OSEN definitions
230e373 HS 2.0R2: Add GAS operation duration statistics into debug
b572df8 HS 2.0R2: Add routine for fetching OSU provider information
1d2215f HS 2.0R2: Add OSU Providers list ANQP element
184e110 HS 2.0R2: Add Icon Request and Icon binary File ANQP elements
7ef6947 HS 2.0R2: Add STA support for Deauthentication Request notification
95a3ea9 HS 2.0R2: Add WNM-Notification Request for Subscription Remediation
f9cd147 HS 2.0R2: Update Indication element to Release 2
bc00053 Interworking: Allow roaming partner configuration
ae6f927 nl80211: Add driver capability for GTK_NOT_USED
2c49d04 Do not clear global pmf setting on FLUSH
eef7235 Only try fast reconnect if network is not disabled
3d910ef Interworking: Prefer last added network during network selection
2a33687 P2P: Remove unnecessary ifdef CONFIG_NO_CONFIG_WRITE
050d8b5 Fix documentation for wpa_supplicant_global_ctrl_iface_process()
8c9cb81 DFS: Fix coding style (missing whitespace)
4f1e01b DFS: Add VHT160 available channels
b8058a6 hostapd: DFS allow mixed channels
4db216f wpa_supplicant: Add support for IPv6 with UDP ctrl_iface
e2364d1 hostapd: Deauthenticate clients forbidden by maclist changes
1748f1d hostapd: Make it possible to remove addresses from maclists
064eb05 Add os_remove_in_array()
c1151e4 Force OFDM/HT/VHT to be disabled on channel 14
bfb79dd nl80211: Show regulatory rule flags in debug output
3d7ad2f hostapd: Configure spectrum management capability
e0392f8 hostapd: Add Power Constraint element
891330f Fix spelling s/algorith/algorithm/
f0e30c8 Do not start another connect work while one is pending
3290398 WPS: Fix UNSUBSCRIBE error returns if NT or CALLBACK header is used
f34df28 WPS: Fix UNSUBSCRIBE to return 412 if no SID match found
80f256a WPS: Remove unnecessary filename NULL check

Change-Id: I7dc25a8bb0074f4970ade8d42dfa60da166baf96
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/eap_register.c
ostapd/hostapd.conf
ostapd/hostapd.eap_user_sqlite
ostapd/hostapd_cli.c
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/authsrv.c
rc/ap/beacon.c
rc/ap/dfs.c
rc/ap/dfs.h
rc/ap/drv_callbacks.c
rc/ap/eap_user_db.c
rc/ap/gas_serv.c
rc/ap/gas_serv.h
rc/ap/hostapd.c
rc/ap/hs20.c
rc/ap/hs20.h
rc/ap/hw_features.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11_shared.c
rc/ap/ieee802_1x.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_ie.c
rc/ap/wpa_auth_ie.h
rc/common/defs.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/common/wpa_ctrl.c
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/eap_common/eap_defs.h
rc/eap_peer/eap_aka.c
rc/eap_peer/eap_methods.h
rc/eap_peer/eap_tls.c
rc/eap_peer/eap_tls_common.c
rc/eap_peer/eap_tls_common.h
rc/eap_server/eap.h
rc/eap_server/eap_methods.h
rc/eap_server/eap_server_tls.c
rc/eap_server/eap_server_tls_common.c
rc/eap_server/eap_tls_common.h
rc/eapol_auth/eapol_auth_sm.c
rc/eapol_auth/eapol_auth_sm.h
rc/eapol_auth/eapol_auth_sm_i.h
rc/radius/radius.c
rc/radius/radius.h
rc/radius/radius_server.c
rc/radius/radius_server.h
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa_ie.c
rc/utils/os.h
rc/wps/wps_upnp_web.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README-HS20
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface.h
pa_supplicant/ctrl_iface_udp.c
pa_supplicant/defconfig
pa_supplicant/eap_register.c
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/hs20_supplicant.h
pa_supplicant/interworking.c
pa_supplicant/interworking.h
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wnm_sta.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_module_tests.c
0970157a386c5a37a66ed762ef127ed329b478f3 25-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> am 79a3a004: (-s ours) am d28183c0: Merge "Android: Use external libnl 2.0 dynamic library"

* commit '79a3a004cabc2d086efc0f7af8f2b230d53b936c':
Android: Use external libnl 2.0 dynamic library
79a3a004cabc2d086efc0f7af8f2b230d53b936c 25-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> am d28183c0: Merge "Android: Use external libnl 2.0 dynamic library"

* commit 'd28183c0c33f5ee3876b49ce24cad01f701b6742':
Android: Use external libnl 2.0 dynamic library
d28183c0c33f5ee3876b49ce24cad01f701b6742 25-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Merge "Android: Use external libnl 2.0 dynamic library"
af042b19cd7747f736dd4111264682b74da1d094 18-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Use external libnl 2.0 dynamic library

Change-Id: Ifb0936eb4ae8147bf58b785ec235f736b39bb30d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
7f93d6fa14a343127754c33a03cf2f641b6ff6e4 21-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit aef5047acc971c97622c85236f0cd84d169221e6

aef5047 P2P: Fix missing eloop_cancel_timeout in invitation trigger
3cdcb34 tests: Add module tests for WPS attribute parsing
da179bd WPS: Fix parsing of 0-length WFA vendor extension subelement
211d7ab P2P: Add even more debug prints for Probe Request in non-Listen state

Change-Id: Ifbdb1c8aa74906aaf60cb5be025dd7f02bb07c6e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
ostapd/ctrl_iface.c
ostapd/hapd_module_tests.c
rc/p2p/p2p.c
rc/wps/wps_attr_parse.c
rc/wps/wps_module_tests.c
pa_supplicant/Makefile
pa_supplicant/ctrl_iface.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpas_module_tests.c
745be3f298f4a0899238a99d96b7ed804edd3329 20-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Remove explicit SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2

Now wpa_supplicant allows to set these options dynamically per network
by adding to 'phase1' "tls_disable_tlsv1_1=1" or "tls_disable_tlsv1_2=1"

Change-Id: I954af5356833bed5b78c4ebf4a50c788ba984114
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/crypto/tls_openssl.c
13ca8d8ea51a1aa5e24c6c956473a11b0c7daed4 20-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 848905b12abf2df650c43cb821d36a13246baacb

848905b Avoid undefined references with CONFIG_WPA_TRACE_BFD=y
9e38836 wpa_debug: Remove 2048 byte message length limit
f667e03 P2P: Address few issues seen with P2P SD
e9a6f18 TLS: Add tls_disable_tlsv1_1 and tls_disable_tlsv1_2 phase1 params
cb10c7d RADIUS DAS: Add support for NAS identification attributes
0d7c5e1 RADIUS DAS: Remove PMKSA entry on Disconnect-Request
d87a6ac WPS: Fix STA state validation when processing PutWLANResponse

Change-Id: I4799cad2fe661db567eb3a92af2b3eefb7c96dab
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
rc/ap/hostapd.c
rc/ap/wps_hostapd.c
rc/crypto/tls.h
rc/crypto/tls_openssl.c
rc/eap_peer/eap_tls_common.c
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/p2p/p2p_sd.c
rc/radius/radius_das.c
rc/radius/radius_das.h
rc/utils/wpa_debug.c
pa_supplicant/Makefile
pa_supplicant/README-P2P
pa_supplicant/wpa_supplicant.conf
73bb22fa892a8967f458db5459684617ac52c063 20-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Remove obsolete ANDROID_P2P from p2p_sd_request

Change-Id: Iaf16eb482eacfbab1511e8fbf62634efda6b9b85
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_sd.c
ec58b164a608cbc1d99e71bb3d86ef4b263377dc 19-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit ac494fcce4270dbd076ab1d167dbffd6e0f7060b

ac494fc Android: Use external libnl 2.0 dynamic library
b7cac41 Fix hostapd and wpa_supplicant build with binutils >= 2.24.x
b62d5b5 Revert "OpenSSL: Do not accept SSL Client certificate for server"
94a3df5 P2P: Enable U-APSD support on GO automatically
a5527a4 P2P: Add more debug prints for Probe Request processing

Change-Id: Ic3354f72b7399b8de86c74018de7a8c1275d893a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
rc/crypto/tls.h
rc/crypto/tls_openssl.c
rc/p2p/p2p.c
pa_supplicant/Makefile
pa_supplicant/ap.c
cd44645b48dc2161fa6c018235aaf4b6a804d576 19-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Make libnl 2.0 support build-agnostic

Change-Id: If9e922d88a542dc30a66879dec614a592e91f350
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
d620e6d0ba63c86303e656e844f89102588ffdb6 18-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Use external libnl 2.0 dynamic library

Change-Id: Ifb0936eb4ae8147bf58b785ec235f736b39bb30d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
bd14a57187b024f49f5b9ace55ef457d8d04650a 18-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit b3253ebb73d6d52ac636c5cc6d958955a5a98fca

b3253eb wpa_supplicant: Complete radio works on disable event
38ecb06 Convert RADIUS debug dumps to use wpa_printf()
a0ac572 EAP-SIM DB: Remove client socket file on connect() error
a1dd890 RADIUS: Add minimal accounting server support
22dd2d7 Fix MSCHAP UTF-8 to UCS-2 conversion for three-byte encoding
9aab811 Fix nt_password_hash build
a9b08ad Remove unused crypto_bignum_rshift()
2dff9e8 Remove unused NFC_RX_HANDOVER_REQ
be24917 nl80211: Use nl80211_set_iface_id() to get hw features data
8a45811 hostapd: Add Operating Mode Notification support
d9dd86b Enable IEEE 802.11w in defconfig

Change-Id: I6bf13cd0b7e3cb3c3550b87a77a035340e9d0a6b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
ostapd/config_file.c
ostapd/defconfig
ostapd/hostapd.conf
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/authsrv.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11.h
rc/ap/ieee802_11_vht.c
rc/ap/sta_info.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/crypto/crypto.h
rc/crypto/crypto_openssl.c
rc/crypto/ms_funcs.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/eap_server/eap_sim_db.c
rc/radius/radius.c
rc/radius/radius.h
rc/radius/radius_server.c
rc/radius/radius_server.h
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
96be6222df414a7dde5c5b1b72df22e67b1a77fc 13-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 7ae7a84eefd43ed9385e2f8f520a918468f87178

7ae7a84 NFC: Workaround nfcpy message debug exception
6ceb95c Avoid NULL dereference in ieee802_1x_get_mib_sta() printf
97efe70 wpa_supplicant: Fix NULL dereference in tls_verify_cb()
c0c11af wpa_supplicant: Fix NULL dereference in eap_fast_parse_end()
93a1cae Remove unnecessary NULL check
1e2ffc6 Fix theoretical NULL dereference in debug printf
cbf21c7 P2P: Avoid compiler warning in p2p_supplicant.c
5479ff9 DFS: Avoid compiler warnings in src/ap/dfs.c
5e6aa04 wpa_supplicant: Fix memory leak in wfd_subelems error path
88853ae Fix CONFIG_WPS_NFC=y build without CONFIG_P2P=y
7ac7fd4 Add bssid/freq hint for driver-based BSS selection
92484e2 Start using unodified Developer Certificate of Origin v1.1
56ec49c Sync with wireless-testing.git include/uapi/linux/nl80211.h
b64afe2 Fix SAE state validation on AP
d6bfaaa NFC: Add summary and success file options for nfcpy scripts
25cfc6f P2P NFC: Add p2p-nfc.py --handover-only option
7bea076 P2P NFC: Clean up p2p-nfc.py error handling
b0d18bc WPS: Make UUID-from-MAC Address easily available
825fb6b P2P: Do not indicate P2P_FIND failure if p2p_scan is in progress
8c18fcc WPS: Add more debug information to M7 AP Settings
d7a15d5 WPS: Indicate current AP settings in M7 in unconfigurated state
d55fc03 P2P: Handle unexpected GO Neg Req reject message more cleanly
062a7c0 Fix persistent P2P connection failure in case channel list changes

Change-Id: I5c400a6503f9f00d259ff225999593958322a1ba
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ONTRIBUTIONS
EADME
ostapd/main.c
ostapd/wps-ap-nfc.py
rc/ap/dfs.c
rc/ap/ieee802_11.c
rc/ap/ieee802_1x.c
rc/ap/wps_hostapd.c
rc/common/sae.c
rc/crypto/tls_openssl.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/nl80211_copy.h
rc/eap_peer/eap_fast_pac.c
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
rc/wps/wps.h
rc/wps/wps_enrollee.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/examples/p2p-nfc.py
pa_supplicant/examples/wps-nfc.py
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_supplicant.c
5da5e3500763805fe6086d650040e8ddb371c165 03-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Add DFS indicator to get_capability freq

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
ed003d2a93648e6201272d2fb8212cbc01085928 06-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit bab6677a3105f15b19b6be4a189e7baf61b4f791

bsb6677 Handle Wi-Fi Display commands more carefully if P2P is disabled
334ec00 Fix Beacon RX before AP setup completion
72e7fb3 nl80211: Fix regression in returning to AP mode after scan

Change-Id: I5d0a74f730d1ed757f8fe9b3402c295bbc3667e5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ap_list.c
rc/drivers/driver_nl80211.c
pa_supplicant/ctrl_iface.c
pa_supplicant/wifi_display.c
3c4793790bf06f1fe08a2ddf604c9caa855151f1 04-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit a05e236b11bfb4dacfc269938181104a6303247c

a05e236 P2P: Do not re-start invitation on Probe Req RX if already ack'ed
e8a1572 The hostap.git master branch is now used for 2.2 development
94ff22e Remove dead code from AP setup
0b5ff2a WPS: Remove unused Credential AP Channel processing
1536cb5 WPS: Remove unused 802.1X attribute parsing and processing
b37d582 Replace ieee802_11_print_ssid() with wpa_ssid_txt()
93ee302 Change version information for the 2.1 release
44f967c Update ChangeLog files to match current implementation

Change-Id: If2602b7bd484c957652d72b9bd80a3d830392fd5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ChangeLog
rc/ap/beacon.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11.h
rc/common/version.h
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/wps/wps.h
rc/wps/wps_attr_parse.c
rc/wps/wps_attr_parse.h
rc/wps/wps_attr_process.c
pa_supplicant/ChangeLog
pa_supplicant/ap.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
9767226d8e6a1adaa33beb9f517ef40dddfa460c 03-Feb-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 1b56d398a7646c66fd3df8f0a5159c920f99de36

1b56d39 wpa_supplicant: Fix misplaced os_free
8597ebd Fix hostapd segfault on beacon hint event
c69ed4d bsd: Fix hostapd compiler warning
d950477 Fix authentication algorithm negotiation in SME code
1412bee nl80211: Show DFS region info in debug messages
fd92413 hostapd: Increase timeout for channel list update to 5 seconds
ff5e1d1 nl80211: Treat RSSI as part of each sched scan matchset
04c366c Fix memory leaks and wrong memory access
fd67275 wpa_supplicant: Fix wrong size memory allocation
4b0f228 nl80211: Fix channel switching with VHT80
e28f39b nl80211: Verify that ifindex attribute is included in survey
4701f37 wpa_cli: Add tdls_external_control to tab completion for SET

Change-Id: Iad3348c5c012c018cc1bfb759a36dbdb237b6468
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ap_config.c
rc/ap/hostapd.c
rc/drivers/driver.h
rc/drivers/driver_bsd.c
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
pa_supplicant/config.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
cf32e60fa7e0d33fe1551a6dba8dcbbec47ea50e 28-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 2e988392436227c51002b573ee27a8cee37f70e9

2e98839 P2P: Disable DNS server from dnsmasq
c07f261 P2P NFC: Add script for connection handover with nfcpy
12288d8 WPS NFC: Protect nfcpy pretty print calls against exceptions
c209dd1 WPS NFC: nfcpy script to use new connection handover design
6202500 WPS NFC: Logging level configuration to wps-nfc.py and wps-ap-nfc.py
1f1b5b3 WPS NFC: Clean up nfcpy script no-wait operations
79ede5a WPS NFC: Validate ctrl_iface response before decoding it
ab1db08 WPS NFC: Use argparse in the nfcpy scripts
6f8fa6e WPS NFC: Update wps-nfc.py and wps-ap-nfc.py to use new nfcpy API
b56f6c8 P2P NFC: Add support for freq option in NFC ctrl_iface commands
91a6501 WPS NFC: Use BSSID and AP Channel from handover select
91226e0 WPS: Add testing option to corrupt public key hash
7312776 WPS NFC: add more debug prints for connection handover report
5cd4f66 WPS NFC: Use AP Channel information from credential container
d2f1837 WPS NFC: Add BSSID and AP channel info to Configuration Token
75dbf98 WPS-STRICT: Update valid Device Password ID and Config Error range
5cd4740 P2P NFC: WPA state machine config with driver-based BSS selection
8e9f53c P2P NFC: Static handover with NFC Tag on client
dd87677 P2P NFC: Enable own NFC Tag on GO Registrar
abe44e3 P2P NFC: Add GO info into handover message when in client role
23318be P2P NFC: Optimize join-a-group operation based on NFC information
86e3208 P2P NFC: Copy DH parameters to a separate group interface
d4b4d7f WPS NFC: Update DH keys for ER operations
ac08752 WPS NFC: Use pubkey mismatch config error from Enrollee
59b45d1 P2P NFC: Add processing of P2P client while NFC handover case
74df9ec P2P NFC: Do not try to join peer if both devices are already GO
201b0f5 P2P: Add test option to disable IP address assignment request
25ef852 P2P: Add support for IP address assignment in 4-way handshake
fdd48ff P2P NFC: Optimize GO Negotiation retries
c4f87a7 P2P NFC: Add NFC tag enabling for static handover
dd37a93 P2P NFC: Report handover select from tag for static handover
db6ae69 P2P NFC: Report connection handover as trigger for P2P
9358878 P2P NFC: Build connection handover messages
c00ab85 P2P NFC: Define WPS_NFC config method
0deab08 P2P NFC: Allow separate WPS/P2P IES to be parsed
fca9958 P2P NFC: Pass OOB Dev Password through P2P parser
ab9e344 P2P NFC: Pass OOB Device Password ID to P2P
5154689 P2P NFC: Add WPS attribute building for P2P NFC
01afd8d P2P NFC: Add NDEF helpers for P2P connection handover messages
9e323a2 P2P NFC: Add OOB GO Negotiation Channel attribute
14d8645 WPS NFC: Allow BSSID and channel to be included in handover select
50d1f89 NFC: Update WPS ER to use the new connection handover design
d950793 WPS NFC: Add support for wpa_supplicant AP/GO mode to use handover
fa4c298 WPS NFC: Process new style handover select
068cdb1 WPS NFC: New style connection handover select from AP/Registrar
3189ca0 WPS NFC: Add AP mode connection handover report
41f9ffb WPS NFC: Build new style carrier record for connection handover request
3f1639d WPS NFC: Split DH key generation to a separate function
9754917 WPS NFC: Update NFC connection handover design
34b6795 WPS NFC: Use abbreviated handshake if both PK hashes delivered OOB
57630e6 WPS: Preparations for allowing SSID filtering for provisioning step
5f45455 WPS NFC: Validate peer public key hash on Enrollee
ff40cd6 WPS NFC: Send M2D with config error 20 on pkhash mismatch
e435417 WPS: Remove Version attribute from NFC messages
72403ec WPS: Add builder functions for AP Channel and RF Bands attributes
ea43ad9 P2P: Make group operating channel available
9f7cd9a P2P: Split add-group-info into a helper function
253f2e3 P2P: Apply unsafe frequency rules to available channels
1682c62 Add a header file defining QCA OUI and vendor extensions

Change-Id: Ia7604d018e1ffb25e06bdc01ce258fc4a0569245
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ctrl_iface.c
ostapd/wps-ap-nfc.py
rc/ap/ap_config.h
rc/ap/sta_info.c
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_i.h
rc/ap/wpa_auth_ie.c
rc/ap/wpa_auth_ie.h
rc/ap/wps_hostapd.c
rc/ap/wps_hostapd.h
rc/common/ieee802_11_defs.h
rc/common/qca-vendor.h
rc/common/wpa_common.h
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_common.c
rc/drivers/driver_nl80211.c
rc/eap_peer/eap_wsc.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_build.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_group.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_parse.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
rc/wps/ndef.c
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_attr_build.c
rc/wps/wps_attr_parse.c
rc/wps/wps_common.c
rc/wps/wps_defs.h
rc/wps/wps_dev_attr.c
rc/wps/wps_dev_attr.h
rc/wps/wps_enrollee.c
rc/wps/wps_er.c
rc/wps/wps_i.h
rc/wps/wps_registrar.c
rc/wps/wps_validate.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README-WPS
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/examples/p2p-action.sh
pa_supplicant/examples/p2p-nfc.py
pa_supplicant/examples/wps-nfc.py
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
1846323989242844f0e857458a8939fa5836429c 24-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 8615bdfac90174c3730ae5e6607b85f8bbec847e

8615bdf Increase global ctrl_iface buffer to same size as per-interface
c5a64e2 GAS client: Use Protected Dual of Public Action frames with PMF
5ce00d0 GAS server: Add support for Protected Dual of Public Action frames
e24fe94 Add definitions for Protected Dual of Public Action frames
7b2c42f hostapd: Fix PMF robust Action frame processing rules
ea6e040 Clear more configuration parameters to default on FLUSH
cf70d29 wpa_supplicant: Schedule PNO on completion of ongoing sched_scan
080cc44 nl80211: Fix sizeof check in vendor command/event handling
a487b35 hostapd: Fix segmentation fault when calling hostapd_cli all_sta
a6cff8b wpa_supplicant: Fix seg fault in wpas_ctrl_radio_work_flush() in error case
f62a3c2 P2P: Clone dtim_period to a new interface
88a0bca Update copyright years in the manpages
32185f5 Sync manpages and command-line options
b948e78 Add manpage for eapol_test
36bd29e wpa_supplicant: Fix usage text based on build options
dcdd383 P2P: Reduce peer expiration age to 60 sec and allow customization
dd27185 Skip normal scan when PNO is already in progress
a2d6365 P2P: Extend the listen time based on the active concurrent session

Change-Id: Iad81dc478319e59d8cfb673e2988d8bd3099b313
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ctrl_iface_ap.c
rc/ap/gas_serv.c
rc/ap/gas_serv.h
rc/ap/ieee802_11.c
rc/common/ieee802_11_defs.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p.h
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/doc/docbook/Makefile
pa_supplicant/doc/docbook/eapol_test.sgml
pa_supplicant/doc/docbook/wpa_background.sgml
pa_supplicant/doc/docbook/wpa_cli.sgml
pa_supplicant/doc/docbook/wpa_gui.sgml
pa_supplicant/doc/docbook/wpa_passphrase.sgml
pa_supplicant/doc/docbook/wpa_priv.sgml
pa_supplicant/doc/docbook/wpa_supplicant.sgml
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/gas_query.h
pa_supplicant/main.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant_i.h
2093d0658d2f0f8b5a98df7accc97fff3b2bb7d5 17-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> P2P: Reduce peer expiration age to 60 sec and allow customization

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
9e3f8ee32a0c11c56b11985805b5492d04886a99 17-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 3eaaca1a0b372f31ddc43d152c3681dce48889bb

3eaaca1 P2P: Allow GO Negotiation Request to update peer entry after PD
443427e P2P: Add missing direct global ctrl_iface commands for P2P
37b4198 P2P: Use GO's operating channel to optimize scan during join
a691d99 P2P: Don't expire the peer, if GO Negotiation is in progress
a0e9d89 Use minimal scan delay upon EVENT_INTERFACE_ADDED
5ddd07c Reset normal_scans counter upon entering INTERFACE_DISABLED state

Change-Id: I07ea029ba6d473af39c74c10b7058de0056695da
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
b9cc2c06682edb323487f8e7cce1bc95875ed01e 15-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Enable 802.11v (WNM) support in wpa_supplicant

Bug: 12552468

Change-Id: I3c65051b76df402155103feb8228e1e4b2221832
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
leanSpec.mk
pa_supplicant/android.config
10b4c79ec2f3eb1d39474ce162cb07da0eab2ddb 15-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Enable 802.11r (Fast BSS transition) support in wpa_supplicant

Bug: 12552177

Change-Id: I595cab7b6cd183e7ea6f52170d34555d14065bd4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/android.config
64b860b7715d176ec6716b31da53de6e82ca6462 15-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Revert 100 ms wait before starting persistent group

Change-Id: I5b1a4cd862662cc161347542b5186c71fb1dfc79
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
4742246a973a8d1939da0b40018ddb57a470aba5 15-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Revert p2p->min_disc_int = 2 change

Change-Id: I5a0ceb4267eb6f10ccd21c219bb0bdec8f6500c5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
1b7cc21fb2978434151423fa496b3a50acca7cdb 14-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Enable 802.11w (PMF) support in wpa_supplicant

Bug: 12231061

Change-Id: I286dcf38be41a8ecaa6a2b5292f849f27f9ab83a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/android.config
pa_supplicant/android.config
344abd362cfe2d03ed956666527352826b67bde5 14-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit efc64886b8a285440e9954b5395a5370d8c5f84f

efc6488 nl80211: Pass station supported channel and oper class info
3ed9727 TDLS: Pass peer's Supported channel and oper class info during sta_add
eed65aa hostapd: DFS setup seg0 correctly for HT40-
25592b2 hostapd: DFS/CSA check if CSA in progress
b19ef32 Android: Remove hostapd dump_file functionality
c48414a P2P: Limit join-a-group scans based on SSID from invitation
78f0c93 Flush secondary device types on FLUSH command
2b38410 P2P: Allow requested device type to be specified with p2p_find
d9bb282 Clear configuration blobs on FLUSH command
c60ba9f Skip network disabling on expected EAP failure
7185e16 EAP-FAST peer: Make debug clearer on missing pac_file configuration
7b88b64 EXT PW: Fix hash return in password fetching
08081ad hostapd: Skip full AP configuration validation on SET command
1785d2e P2P: Wait on GO Negotiation Confirm transmit
472fa21 P2P: Cancel action frame offchan wait after recv GO Neg Conf
bfdc2a3 bsd: Fix NULL pointer dereference on error path
38bbd06 bsd: Prepare event buffer on init process
3043b4f nl80211: Document how to configure for libnl 2.0 and 3.2

Change-Id: Ia592bc948eaa43dbfaf0b4a20231efca61acb11f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/defconfig
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/dfs.c
rc/ap/hostapd.c
rc/common/ieee802_11_defs.h
rc/drivers/driver.h
rc/drivers/driver_bsd.c
rc/drivers/driver_nl80211.c
rc/eap_peer/eap.c
rc/eap_peer/eap.h
rc/eap_peer/eap_fast.c
rc/eap_peer/eap_i.h
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p_go_neg.c
rc/rsn_supp/preauth.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
pa_supplicant/README-P2P
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/ctrl_iface.c
pa_supplicant/defconfig
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
97a1e7d55662fa4a41b05b9fbd2e9e03e153266a 10-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Android: Remove sd lists

Change-Id: I135d58bf8b382fc9c735507df72193e9665357a7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/p2p/p2p_sd.c
fb79edc9df1f20461e90e478363d207348213d35 10-Jan-2014 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 95fb2db2420d8fa291fd6423cc6dbcd042f4eb46

95fb2db P2P: Reject group formation on WPS provisioning failure
6fc61e1 Fix TX status processing during AP mode shutdown in wpa_supplicant
90a545c nl80211: Clean up netlink parsing and debug prints
b6a9590 Interworking: Keep up to two pending GAS_REQUEST responses
090b8e3 Update copyright notices for the new year 2014
991aa9c nl80211: Move CS supported flag to wpa_driver_capa
f0cbb98 Add DRIVER-STATUS command for hostapd
188ebcd EAP-IKEv2 peer: Fix a memory leak in notify round
a190189 Remove PEAPv2 support
16a19dd EAP-pwd peer: Allow fragmentation limit to be configured
60bf585 EAP-IKEv2 peer: Allow fragmentation limit to be configured
ea6fc58 WPS: Convert printf() debug print to use wpa_printf()
c4b8c71 EAP-GPSK: Report CSuite negotiation failure properly
5a0f596 EAP-GPSK: Allow forced algorithm selection to be configured
5f01c3c EAP peer: Improve failure reporting from METHOD with no eapRespData
7271ee8 Fix EAP-GPSK server compilation for SHA256 cipher suite
356d148 Interworking: Add optional freq argument to INTERWORKING_SELECT
a09ffd5 Fix req_scan-deplete-timeout and update eloop API for this
083916c P2P: Clear p2p_disabled and p2p_per_sta_psk on FLUSH command
3f45fc4 P2P: Clear services on FLUSH command
1f965e6 Allow external programs to request wpa_radio work items
6428d0a Do not start wpa_radio work during externally triggered scan
6470f47 Remove unneeded scan delay on connection-in-progress
4bb2321 Remove unneeded GAS query delay on connection-in-progress
6ac4b15 Use wpa_radio work for connection
b9e6d70 Use radio work for GAS requests
e05e130 P2P: Use radio work to protect offchannel Action frame exchanges
e1d1c8e Use radio work for P2P Listen requests
1b5d471 Use radio work for P2P scan requests
d12a51b Use radio work for scan requests
b1ae396 Add framework for exclusive radio operations
dd43aaa Add helper functions for cloning and freeing scan parameters
06f9acc Ignore externally triggered scan results with scan_res_handler
c9b5559 Clean up ctrl_iface debug prints for monitor events
d31b5ac Use cleaner debug print for ctrl_iface commands with private info
9595151 Remove duplicated RX ctrl_iface hexdump
9b85079 Fix scan-cache-clearing operation to avoid unnecessary cases
2f30cac Avoid unnecessary key clearing operations
466bcf9 Remove some unnecessary EAPOL port (un)authorized callbacks
949938a Ask driver to report only new scan results if requested
a1a31b6 Remove hostapd dump_file functionality
ea23df6 Make EAPOL dump data available through ctrl_iface STA command
96ea74b Convert EAPOL authenticator dump into easier to parse format
ca3b71c Remove hostapd dump_file data that is available through ctrl_iface
4c03a2b Make RADIUS server MIB available through control interface
f538be3 Add more STA information into the ctrl_iface STA command
101bdc2 Remove forgotten notes about already removed driver wrappers
7006753 Update EAP-FAST note regarding OpenSSL support
17b79e6 nl80211: Initial support for vendor commands and events
5890fa8 WPS: Fix clear-from-timeout handling to avoid race condition
c64e3a0 P2P: Send received Presence Response information to ctrl_iface monitors
f7fb676 ACS: Mark acs_fail() static
3cf06c9 OpenSSL: Include sha1/sha256 header files to verify declarations
5ace51a WNM: Clean up le16 variable use to avoid sparse warnings
c583868 Mark wpas_wps_er_nfc_handover_sel() static
8cf1e68 Move declaration of hostapd_acs_completed() into correct header file
0187c41 Declare wpa_debug_* variables in src/utils/wpa_debug.h
fcc6123 Declare wpa_drivers in src/drivers/driver.h
0d79b50 Clear EAPOL Logoff state on FLUSH command
327b01d nl80211: Add driver param for forcing monitor and connect APIs
6f06766 nl80211: Fix nl_mgmt handling in partial error case
4ea6a47 nl80211: Prefer newer scan result over older during duplicate removal
2eef517 nl80211: Report set_supp_port failures in debug log
a0bdd19 nl80211: Share a helper function for connect and associate commands
e00d546 Remove unnecessary build #ifdef from definitions
4848a38 Get rid of duplicated cipher suite and AKM definitions
de4ed4a nl80211: Use helper functions for cipher suite mapping
a565084 nl80211: Set control port for NL80211_CMD_COMMAND
ef93abd WPS: Clean up UUID debug print
35f3d3e nl80211: Clean up regulatory rule debug prints
880de88 nl80211: Print frame registration match on same debug line
03ed332 Interworking: Allow cred blocks not to be saved to a file
04f7ecc Reset WPA parameters to default values on FLUSH command
152cff6 P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option
538d6f4 WPS: Use shorter scan interval during pre-provisioning search
3187fd9 WPS: Replace wpas_wps_in_progress with identical wpas_wps_searching
4414d9e SAE: Fix ECC element y coordinate validation step
069fb47 EAP-EKE: Allow forced algorithm selection to be configured
3a88914 Remove unused information element parsing data
dbfb8e8 Remove unnecessary EVENT_RX_ACTION
1450e1e Define __maybe_unused
912b34f Do not process Action frames twice in hostapd SME/MLME
006309b Fix whitespace style
6780713 WPS: Remove unused send_wpabuf()
e912986 tests: Verify concurrent WPS protocol run with assigned PIN
8aaafce Make local UUID available through ctrl_iface STATUS command
0e22b8d WPS: Make sure reconfiguration timeout is not left behind on deinit
75d1d0f WPS: Allow testing mode to disable 2.0 functionality
f7e2542 Remove unused wps_device_data_dup()
c89d9db Remove unnecessary extra tracking of eloop registration
c86bf16 Replace unnecessary hex_value() with hex2byte()
7b02375 Clear wps_fragment_size on FLUSH command
aa189ac Enable FT with SAE
2d2ecf5 nl80211: Fix protected Action frame reporting for AP mode
db76aa6 Fix PeerKey 4-way handshake
7732729 Fix PeerKey deinit behavior
8d321a7 WNM: Move disassociation imminent sending to wnm_ap.c
b76f4c2 hostapd: Make STA flags available through ctrl_iface STA command
aa03dbd Remove IEEE80211_REQUIRE_AUTH_ACK
121f2ab Remove unused STA flags
3578e66 WNM: Add STA flag to indicate the current WNM-Sleep-Mode state
4776897 WNM: Fix AP processing without wnm_oper driver callback
2025cad WNM: Move ESS Disassoc Imminent sending to a helper function
28ab64a WNM: Minimal processing of BSS Transition Management Query/Response
2cd0f6a WNM: Add Target BSSID into BSS Transition Management Response
a8a6a35 WNM: Use nonzero dialog token in BSS Transition Management Query
629edfe WNM: Fix Sleep Mode AP processing in open network
3c1060f WNM: Add debug logs to get the RSSI from the scan results
dff1e28 Initial handling of GTK-not-used cipher suite
51e3eaf OpenSSL: Do not accept SSL Client certificate for server
6bf61fb OpenSSL: Use certificates from TLS authentication in OCSP stapling
c962947 WPS ER: Fix deinit timeout handling with delayed/failing unsubscribe
7b75c30 WPS: Reschedule AP configuration reload on EAP completion
c511b32 WPS: Remove old duplicate network even if key is different
9d2cb3e Make CONFIG_TESTING_OPTIONS=y enable all testing options
662b40b WPS: Reduce scan wait time during WPS processing
015af91 Do not use results from externally requested scan for network selection
1cd93ff Reschedule own scan request if an externally started one is in progress
dc3906c Show timing information about scan requests in debug log
d81c73b Optional scan id for ctrl_iface SCAN requests
a5f40ef Track whether scan was started by us or an external program
18ae237 Fix comment format
88c2d48 Allow passive scan to be requested with SCAN passive=1
3ae3ec2 nl80211: Add scanned frequencies/SSIDs into debug log
69278f7 Remove unused last_scan_full
1f5d2dd Interworking: Allow EAP-FAST to be used
6ffa168 Add GAS-QUERY-START and GAS-QUERY-DONE event messages
93827f4 hostapd: Allow external management frame processing or testing
fee5234 Allow channel list to be specified for SCAN command
98eda9c Move int_array helpfer functions to utils/common.c
a4cfb48 Add make lcov-html to generate code coverage report
bee25cc nl80211: Fetch cipher capabilities from the driver
4daa011 Clean up cipher capability prints
35c2006 Convert wpa_hexdump functions to use void pointer instead of u8 *
5f9c134 Remove obsolete license notifications
bd1e328 Android: Remove old WEXT extensions
bad5cdf Verify that beacon setup succeeds before proceeding
7d7f7be Verify group key configuration for WPA group
30675c3 Add definitions for new cipher suites from IEEE Std 802.11ac-2013
13b24a7 VHT: Use status code 104 to indicate VHT required
ab41595 wpa_supplicant: Fix crash when terminating all interfaces
76aab03 Add secondary channel IE for CSA
8f4713c Store entire CS freq_params and not only freq
13daed5 Include driver.h in hostapd.h
a12d345 wpa_supplicant: Use monotonic time for last_scan check
51bffab WPS: Use monotonic time for AP connection attempt
6473e5c wpa_supplicant: Use relative time for TKIP Michael MIC failures
4e1eae1 wpa_supplicant: Use monotonic time for temp-disabled networks
151ab80 P2P: Use monotonic time for GO client waiting
3326f19 IBSS RSN: Use monotonic time for reinit detection
196a217 WPS_UPNP: Use monotonic time for event debouncing
864c9af wps_registrar: Use monotonic time for PBC workaround
61e98e9 wps_registrar: Use monotonic time for PBC session timeout
3647e5a wps_registrar: Use monotonic time for PIN timeout
3618618 rsn_supp: Use monotonic time for PMKSA cache expiry
c2be937 wpa_supplicant: Use monotonic time for EAPOL RX workaround
e72a001 bgscan: Use monotonic time
e05f060 rsn_supp: Do not track expiration time
5870717 RADIUS server: Use monotonic time
4012804 RADIUS client: Use monotonic time
acb69ce wpa_supplicant: Use monotonic time for RX/BSS times
46b8d4c wpa_supplicant: Use monotonic time for SA query timeout
f073fde EAP server: Remove SIM-DB pending timestamp
636e19a wpa_ctrl: Use monotonic time for request retry loop
7ffe7d2 AP: Use monotonic time for MMIC failure/TKIP countermeasures
dd4e32b AP: Use monotonic time for PMKSA cache
0fc545a AP: Use monotonic time for STA accounting
3e06180 bgscan_learn: Start scanning from the first freq
f4c73ae bgscan_learn: Fix initial interval
7dab119 bgscan_learn: Avoid redundant frequencies
3727123 bgscan: Stop bgscan only on disassociation
b2838ba Update IBSS documentation to include RSN option
429dd9a Advertise QoS Map support based on driver capability
049105b nl80211: Add support for QoS Map configuration
74ddd64 nl80211: Sync with mac80211-next.git
9fcd300 nl80211: Sync with wireless-testing.git

Change-Id: Iabdd88d9cabd478a41c3cb0a8d061b425cc1beca
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
EADME
ostapd/Android.mk
ostapd/Makefile
ostapd/README
ostapd/android.config
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/defconfig
ostapd/dump_state.c
ostapd/dump_state.h
ostapd/hostapd.conf
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/accounting.c
rc/ap/acs.c
rc/ap/acs.h
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/ap_list.c
rc/ap/beacon.c
rc/ap/beacon.h
rc/ap/ctrl_iface_ap.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/hw_features.h
rc/ap/ieee802_11.c
rc/ap/ieee802_11.h
rc/ap/ieee802_11_ht.c
rc/ap/ieee802_11_vht.c
rc/ap/ieee802_1x.c
rc/ap/pmksa_cache_auth.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/tkip_countermeasures.c
rc/ap/vlan_init.c
rc/ap/vlan_init.h
rc/ap/wmm.c
rc/ap/wmm.h
rc/ap/wnm_ap.c
rc/ap/wnm_ap.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_ft.c
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_i.h
rc/ap/wps_hostapd.c
rc/ap/wps_hostapd.h
rc/common/defs.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/common/sae.c
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/common/wpa_ctrl.c
rc/common/wpa_ctrl.h
rc/crypto/crypto_openssl.c
rc/crypto/tls.h
rc/crypto/tls_gnutls.c
rc/crypto/tls_openssl.c
rc/drivers/android_drv.h
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_bsd.c
rc/drivers/driver_common.c
rc/drivers/driver_madwifi.c
rc/drivers/driver_ndis.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/driver_wext.h
rc/drivers/drivers.c
rc/drivers/netlink.c
rc/drivers/nl80211_copy.h
rc/drivers/priv_netlink.h
rc/eap_peer/eap.c
rc/eap_peer/eap_eke.c
rc/eap_peer/eap_gpsk.c
rc/eap_peer/eap_ikev2.c
rc/eap_peer/eap_peap.c
rc/eap_peer/eap_pwd.c
rc/eap_peer/ikev2.c
rc/eap_server/eap_server_peap.c
rc/eap_server/eap_sim_db.c
rc/eapol_auth/eapol_auth_dump.c
rc/eapol_auth/eapol_auth_sm.h
rc/eapol_supp/eapol_supp_sm.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/radius/radius_client.c
rc/radius/radius_das.c
rc/radius/radius_server.c
rc/rsn_supp/peerkey.c
rc/rsn_supp/peerkey.h
rc/rsn_supp/pmksa_cache.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_ft.c
rc/utils/common.c
rc/utils/common.h
rc/utils/eloop.c
rc/utils/eloop.h
rc/utils/eloop_win.c
rc/utils/wpa_debug.c
rc/utils/wpa_debug.h
rc/wps/httpread.c
rc/wps/wps_attr_build.c
rc/wps/wps_dev_attr.c
rc/wps/wps_dev_attr.h
rc/wps/wps_er.c
rc/wps/wps_registrar.c
rc/wps/wps_upnp.c
rc/wps/wps_upnp_i.h
pa_supplicant/Makefile
pa_supplicant/README
pa_supplicant/README-HS20
pa_supplicant/README-P2P
pa_supplicant/android.config
pa_supplicant/ap.c
pa_supplicant/bgscan_learn.c
pa_supplicant/bgscan_simple.c
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface.h
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/defconfig
pa_supplicant/driver_i.h
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/gas_query.h
pa_supplicant/ibss_rsn.c
pa_supplicant/ibss_rsn.h
pa_supplicant/interworking.c
pa_supplicant/interworking.h
pa_supplicant/main.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/preauth_test.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/sme.c
pa_supplicant/tests/test_wpa.c
pa_supplicant/wnm_sta.c
pa_supplicant/wnm_sta.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_priv.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
3cf6f79011d16f23e60cbf2846aab0fd440511da 18-Dec-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit commit 8fcabc681760a390dc9ce16de57162e52e39058b

8fcabc6 Treat VER_2_1_DEVEL the same as VER_0_8_X
b154a24 Fix a never-ending loop with multiple radios in wpa_supplicant
493ba87 hostapd: Clear interface_added flag on error path

Change-Id: I5349c6cb829e0c36a172bbf1ae19c09ff912abfc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/hostapd.c
pa_supplicant/wpa_supplicant.c
04f534e89ed127da4077485376f24debc50d80d5 10-Dec-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 075131e32e6967977da4bbfa8a7f63dbfbf86008i

075131e Android: Do not compile wpa_supplicant if not chosen
f7154ce DFS: Use channel switch when radar is detected
6c6c58d hostapd: Make hostapd_set_freq_params() public
b72f949 DFS: Allow skipping radar channels
8d1fdde nl80211/hostapd: Extend channel switch notify handling
10e694a AP: Use monotonic clock for SA query timeout
af53896 Use monotonic clock for RADIUS cache timeouts
fe52c21 Use monotonic clock for last_sae_token_key_update
100298e AP: Use monotonic time for AP list
e5c9e40 OS utils: Add os_reltime_expired()
b3493fa AP: Use monotonic time for STA connected time
ed0ebee OS utils: Provide os_reltime_age()
8567866 P2P: Handle frequency conflict in single channel concurrency case
b125c48 P2P: Add wfd_dev_info= field for device found event
e706d2d bsd: Fix compilation error for NetBSD
f757950 eap_proxy: Extend Android.mk to support additional libraries

Change-Id: I6d4f0f559f420680903d12966c7a6a87da97d61a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/ap_list.c
rc/ap/ap_list.h
rc/ap/ctrl_iface_ap.c
rc/ap/dfs.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/ieee802_11.c
rc/ap/ieee802_11_auth.c
rc/ap/ieee802_11_shared.c
rc/ap/ieee802_1x.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_bsd.c
rc/drivers/driver_nl80211.c
rc/utils/os.h
pa_supplicant/Android.mk
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wifi_display.c
pa_supplicant/wifi_display.h
pa_supplicant/wpa_supplicant.c
d4c0acfaa8a0784e47b65390c5e0a8b015d7fa3d 06-Dec-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "Revert "Android: Handle Freq conflict in single channel concurrency case""
df2c7ad4090c4822579f403ace487f8a201fa4b3 06-Dec-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "Cumulative patch from commit 0ad3b9c402ee92863b720bc01f882ebcb1bd42c8"
a781b54fd4b35003ce0a9de4b1901477fc02d0a9 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am 42e54fa6: am dd9a784a: Merge commit \'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88\' into HEAD

* commit '42e54fa663fd2eb8801ecc029d10fa8c2e29915d':
42e54fa663fd2eb8801ecc029d10fa8c2e29915d 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am dd9a784a: Merge commit \'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88\' into HEAD

* commit 'dd9a784a6d34cdc14c68b03c2402e4fbd5cd7e20':
a6163554e8e14a7f561b94f5743ae9df2424c969 05-Dec-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Android: Handle Freq conflict in single channel concurrency case"

Change-Id: Id1ccb6111a5688d464d359dabae7566d70d672a6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/wpa_ctrl.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_supplicant.c
01904cfafd75a70b9f29c0220b90bdef45595491 05-Dec-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 0ad3b9c402ee92863b720bc01f882ebcb1bd42c8

0ad3b9c Use wpa_radio data for get_shared_radio_freqs()
1b544ff Use wpa_radio data for wpas_wpa_is_in_progress()
5b81927 Use wpa_radio data for wpas_p2p_search_delay()
c67e7e2 Use wpa_radio data for channel list updates
f88f19b Use wpa_radio data for scan result updates
202dec2 Add shared per-radio structure for wpa_supplicant
73c00fd Move wpa_supplicant driver initialization into a helper function
7feff06 Add CONFIG_CODE_COVERAGE=y option for gcov
d9c753b EAP server: Handle EAP method initialization failures more cleanly
59d3438 EAP server: Initialize TLS context based on private_key
6b417a1 Reject TLS-based EAP server method if TLS context not initialized
158b090 nl80211: Fix regression in P2P group interface removal
6f72577 P2P: Handle INTERFACE_DISABLED event on a P2P GO interface
336167c AP: Fix inactivity STA timer trigger for driver offload case
1245503 Restore scan_req if sta scan is rescheduled in the scan results event
bdec7ee D-Bus: Add support to set pkcs11_{engine,module}_path
80ed037 Clear beacon_data before usage

Change-Id: I1a87557ad09419b88b993ba13f58359121e3543b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
rc/ap/Makefile
rc/ap/authsrv.c
rc/ap/hostapd.c
rc/ap/sta_info.c
rc/common/Makefile
rc/crypto/Makefile
rc/drivers/Makefile
rc/drivers/driver_nl80211.c
rc/eap_common/Makefile
rc/eap_peer/Makefile
rc/eap_server/Makefile
rc/eap_server/eap_server.c
rc/eap_server/eap_server_tls_common.c
rc/eapol_auth/Makefile
rc/eapol_supp/Makefile
rc/l2_packet/Makefile
rc/p2p/Makefile
rc/radius/Makefile
rc/rsn_supp/Makefile
rc/utils/Makefile
rc/wps/Makefile
pa_supplicant/Makefile
pa_supplicant/dbus/Makefile
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
e701d41f0adb79913ad5851f52cc6f522c0b34cd 05-Dec-2013 Ying Wang <wangying@google.com> am 2db4db04: am 243e04f8: Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"

* commit '2db4db04ec38c53f9189070782f2d1be7832761e':
Treat VER_2_1_DEVEL the same as VER_0_8_X
Android: Do not compile wpa_supplicant if not chosen
dd9a784a6d34cdc14c68b03c2402e4fbd5cd7e20 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88' into HEAD
2db4db04ec38c53f9189070782f2d1be7832761e 05-Dec-2013 Ying Wang <wangying@google.com> am 243e04f8: Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"

* commit '243e04f81f9bef56ff5663bc25d280c7c33beb87':
Treat VER_2_1_DEVEL the same as VER_0_8_X
Android: Do not compile wpa_supplicant if not chosen
243e04f81f9bef56ff5663bc25d280c7c33beb87 05-Dec-2013 Ying Wang <wangying@google.com> Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"
4752b4046c7bd253ff4aed0019381521f907d7be 05-Dec-2013 Ying Wang <wangying@android.com> Merge "Android: Do not compile wpa_supplicant if not chosen"
966cdfc951309c0a13b9d167a2a2077b7dfaa07d 25-Nov-2013 Ying Wang <wangying@google.com> Treat VER_2_1_DEVEL the same as VER_0_8_X

The Android.mks to include are actually the same.

Change-Id: I0ca51e744c9f1f09812f20064c0ae316856e0dc4
ndroid.mk
993d558670f19867fd8209076b0697ba4f9146c6 23-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Do not compile wpa_supplicant if not chosen

Change-Id: I60c91fd04589386f9a7cbf1ae82fd545634640c7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid.mk
ee652d5b6bac336caec6536abab27431f79bb902 26-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Android: Increase timeout in provision discovery request"

Change-Id: Ifbd17ee3dc6d226fab07fff47d28f989f1ca25e0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
370782ac05d9812b896b30dcd1f51b94cd3bd1fe 26-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Android: Restore p2p_group_formation pointer"

Change-Id: Ic55ba014bc040a4f910effc2fea78b4dfa0e6e37
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
9f1118de2690245cdeeb016c13cb6d59ea887f92 25-Nov-2013 Ying Wang <wangying@google.com> Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"
02552fd6e2a03970c014d71b3ca5f45caaa62327 25-Nov-2013 Ying Wang <wangying@google.com> Treat VER_2_1_DEVEL the same as VER_0_8_X

The Android.mks to include are actually the same.

Change-Id: I0ca51e744c9f1f09812f20064c0ae316856e0dc4
ndroid.mk
38bb0ce24518c064f6df21f99fd14123159ed51f 25-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Increase scan delay after disconnect"

Change-Id: Ia9d2197b69de9bea2f34e351cccbeafdea8c4525
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
8ccf0ee1744d3970b7120c22363b18796e257f15 25-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Fix scan notification in case of canceling scan"

Change-Id: Ic9bd6af57e66646f088fc771742c9cb55f1b3a26
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/scan.c
558477c0b2a5a7db679c1ad7551d43e6364d1df2 23-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Do not compile wpa_supplicant if not chosen

Change-Id: I60c91fd04589386f9a7cbf1ae82fd545634640c7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid.mk
292b0c3a742226c295f8db76eaef9e90c90e7513 22-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit a94737ea38a44ba7c8d4e48dd824c67a5b70bee3

a94737ea Android: P2P: Remember country locale
5e2c3490 Android: Add driver_cmd for arbitrary driver commands
0de38036 Android: Add P2P/WPS wrappers for private lib
92ecda40 hostapd: Set proper VHT capabilities
77a3e796 hostapd: Fix set beacon in multiple BSSID scenario
179fc552 TDLS: Do not reenable TDLS link on retransmitted setup frame
cc14091e VHT: Fix memory leak in STA entry

Change-Id: I38d0200c426d6f6671b8f2899b9236c4c135788a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/beacon.c
rc/ap/ieee802_11_vht.c
rc/ap/sta_info.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/rsn_supp/tdls.c
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
pa_supplicant/wpa_cli.c
66395bb06dfb3c234a341194238042d79af459a6 22-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Revert assoc reject handling

Change-Id: I17117b3f835acabc2297b6fd3134daf92635bb30
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/config_ssid.h
pa_supplicant/events.c
pa_supplicant/wpa_supplicant.c
384894a657e4634a30bbcba4fdc211299e217215 25-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Enable HS2.0 and Interworking

Change-Id: I5dc8cc6d322fe960eeb8749d701b2664a2eb2811
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/android.config
fa3fc4a1ac08ad14272301c7f6f01b362997c3e4 21-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 594516b4c28a94ca686b17f1e463dfd6712b75a7

594516b Use monotonic clock for relative time for eloop if available
461e3eb Fix and work around some MinGW compilation issues
81cbc04 Fix compiler warning for OpenSSL without HAVE_OCSP
68d628a hostapd: Fix interface enabling/disabling and DFS
1cba9be STA: Cancel sched_scan while initiating wps_reassoc
215a02f Add Wi-Fi Direct to the build configuration example
ca9c14f dbus_new: Add documentation for D-Bus TDLS methods
6fc4848 P2P: Short scan wait to speed up the group re-invocation
93a06fe Fix QoS Map Configure frame use

Change-Id: Id76002ca7fa742b6533e7e592ffd3867886dc50e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/crypto/tls_openssl.c
rc/utils/eloop.c
rc/utils/eloop.h
rc/utils/eloop_win.c
rc/utils/os.h
rc/utils/os_internal.c
rc/utils/os_none.c
rc/utils/os_unix.c
rc/utils/os_win32.c
pa_supplicant/Makefile
pa_supplicant/android.config
pa_supplicant/defconfig
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wps_supplicant.c
a0d265f81180f341d22511538fa18166e1bbce9f 19-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 00043740251716e83ca8a01b5b8a2bed1ed02db9

0004374 P2P: Prefer U-NII-3 over U-NII-1 during channel selection
1b665cb P2P: Fix channel preference use for MCC p2p_connect
5624ccf P2P: Optimize default case for own freq preference setting
d0f61a4 P2P: Fix p2p_ignore_shared_freq=1 when inviting a peer
21e491f P2P: Fix p2p_ignore_shared_freq=1 during invitation processing

Change-Id: I79cdeb935ff2eb14ba99b5fc3d364b9399e3f89f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_utils.c
pa_supplicant/p2p_supplicant.c
e0e48dc666fb14a7bb60264ca87463ba7bc1fe0b 18-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 107a89448c8a127e9131bc9288b9093720b87781

107a894 P2P: Clean up wpas_p2p_setup_freqs() debug message
7d669cf P2P: Clean up wpas_p2p_init_go_params()
384bdd0 P2P: Prefer VHT channels for initial pick
a30d50b P2P: Prefer HT40 channels for initial pick
f240710 P2P: Prefer 5 GHz channels for initial pick
b2d4aaa P2P: Select VHT channel at random instead of using the first entry
ee8f6ea P2P: Select HT40 channel at random instead of using the first entry
5576663 P2P: Move random channel selection into a helper function
b17d89b P2P: Fix channel selection for MCC case
f86d282 Handle legacy scan interruption of sched_scan/PNO
334bf36 Add chan_switch to ctrl interface of wpa_supplicant and hostapd
bf281c1 Add AP channel switch mechanism
e44a384 Move AP parameter filling into a helper function
1c4ffa8 nl80211: Add channel switch implementation
dcca221 wpa_supplicant: Update channel switch driver interface
e1925bd eloop: Remove eloop_none.c
3505743 Sync with wireless-testing.git include/uapi/linux/nl80211.h
f6c2b8c Android: Add state message sent after 'status' command
6b49907 Android: Add SSID in supplicant change event
22cf7d7 SCARD: Clean up SIM/USIM selection
cea97a0 dbus_new: Add DBus TDLS methods
cc4952a Request new scan only for the original interface
fa58da2 Remove old mechanism of skipping scan request rescheduling
e2f5a98 Deplete scan request if new time is less than remaining
dcd25d4 P2P: Use negotiated channel from invitation for persistent GO
800d587 TDLS: Provide external control to specify the peers for setup
795baf7 hostapd: Filter channel list updated events after country code change
146fa9b nl80211: Do not force interface down on deinit
49b4b20 nl80211: Do not for station mode on hostapd deinit
04eff7d nl80211: Remove build time condition on HOSTAPD define
0d547d5 nl80211: Share more code between hostapd and wpa_supplicant
7b7de4c nl80211: Remove read-only last_freq/last_freq_ht

Change-Id: Idba1eb8d63480fbc30eee11d0d8e189ccc49ddd3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ctrl_iface.c
ostapd/hostapd_cli.c
rc/ap/ap_drv_ops.h
rc/ap/beacon.c
rc/ap/beacon.h
rc/ap/ctrl_iface_ap.c
rc/ap/ctrl_iface_ap.h
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/common/ieee802_11_defs.h
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/nl80211_copy.h
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_utils.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
rc/utils/Makefile
rc/utils/eloop.c
rc/utils/eloop.h
rc/utils/eloop_none.c
rc/utils/eloop_win.c
rc/utils/pcsc_funcs.c
rc/utils/pcsc_funcs.h
pa_supplicant/android.config
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/defconfig
pa_supplicant/driver_i.h
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
e86b95125ee6d7381c6a399c41b0b7c737627cad 14-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Remove obsolete ANDROID_P2P from ieee802_1x_finished()

Change-Id: Icdd3e6edeb65e6ac0cad5ec1ef87026063173a0a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_1x.c
66509d9e85f69f10d87c036b57252385f6c3b336 18-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "Android: Remove #ifdef ANDROID_P2P from wps_registrar_remove_pbc_session"
6990092f7c3091b2e876e923c33848bca761af83 18-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Merge changes I01c09b4d,I0a524cdb,I378fcfc4

* changes:
Android: Remove changing oper_freq in p2p_process_go_neg_conf()
Revert setting wpa_s->conf->ap_scan = DEFAULT_AP_SCAN
Revert "Allow immediate scan request even if another scan was scheduled later"
3f3d6a59b3e3d1aaaa2176db065a4f1a88ad7c70 18-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "Revert "Allow immediate scan request even if another scan was scheduled later""
8a4157206df48bb4855273096a6d7eac2f54b24f 11-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Remove #ifdef ANDROID_P2P from wps_registrar_remove_pbc_session

Change-Id: Idcf738aca2e348b2c49bc41a63f90b084901f0ee
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/wps/wps_registrar.c
7e6eef4d7cae2a3f6b49744844c20cce3dc2ef28 11-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Remove changing oper_freq in p2p_process_go_neg_conf()

Change-Id: I01c09b4de7f6b8cc62912896e4e6fb1850de657e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_go_neg.c
9958d9b2d2e7fe86372e2f3792f1bd6a5ad0ee20 11-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert setting wpa_s->conf->ap_scan = DEFAULT_AP_SCAN

Change-Id: I0a524cdb45b9c80f592d1f76521870ee652f460f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
378fcfc43fed7122e0296bd90fbc67234b173660 11-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Allow immediate scan request even if another scan was scheduled later"

This reverts commit 81e9700b8fb135b898181ad3aeb44d39f0a01907.
pa_supplicant/scan.c
cfa16a0eb1fb376f744b07e355ec071f50fcb61d 15-Nov-2013 Naresh Jayaram <c_njayar@qti.qualcomm.com> am f62167e8: (-s ours) TDLS: Provide external control to specify the peers for setup (DO NOT MERGE)

* commit 'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88':
TDLS: Provide external control to specify the peers for setup (DO NOT MERGE)
f62167e88c0c1b9621f2984f1a59ae7d41cf4c88 13-Nov-2013 Naresh Jayaram <c_njayar@qti.qualcomm.com> TDLS: Provide external control to specify the peers for setup (DO NOT MERGE)

Bug: 11631777

Change-Id: I3fbcf3cef4a6a4d894f78dd3dbe4757831e4fc56
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
394564bdfeab08390380847d20dabbad92cf28bc 11-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Allow immediate scan request even if another scan was scheduled later"

This reverts commit 81e9700b8fb135b898181ad3aeb44d39f0a01907.
pa_supplicant/scan.c
ff07917b8921a2a178ed9188a63b166af144ae53 08-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Minor sync with mainstream code

Change-Id: Ia7b165534577394e0117318e6655d14a3a1d9d2d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/crypto/tls_openssl.c
rc/p2p/p2p_utils.c
pa_supplicant/p2p_supplicant.c
8f0dbf4c846369f18f4571cd997a6b4538d4e5db 08-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Remove ' (auth)' from WPA_EVENT_CONNECTED message

Change-Id: Ie88f9cc6c9ba2ff6ce03e36d6238d55d91d85649
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant.c
c0a8db0d311c9b3668e893e4f6f9285a825612cd 08-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Fix join for p2p_connect"

This reverts commit a7534b9cdb4f9c2b9ca56761119b0505626f03d6.
pa_supplicant/ctrl_iface.c
5460547a121207cf7a99eac45e05fcdd83be3161 08-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 10222ca19217b743687be311183f58a250d3a55f

10222ca Android: Sync Android.mk with Makefile
aebfbcb Android: Sync Android.mk with Makefile
890b3a4 Android: Sync Android.mk with Makefile
736abfc Android: Set proper path to keystore include dir
bbd84e5 Android: Add CONFIG_ACS option to makefile
5e42035 Android: Fix CONFIG_EAP_PROXY option and move it to right place
643fab3 Android: Add CONFIG_IEEE80211AC option to makefile
4ba8309 Android: Add CONFIG_EAP_UNAUTH_TLS option to makefile
53414a7 Android: Add liblog
1d415f1 Android: Switch keystore to binder
4e5a4d3 Android: Get rid of LOCAL_MODULE_TAGS := user
206d813 Android: Restore OpenSSL ENGINE support
6dfdb80 Android: Remove obsolete keystore path
1176ab6 Android: Use keystore ENGINE for private key operations
6dc94a6 Android: Use correct header file path for capability.h
91f9e60 GAS: Replenish AP station session timer to 5 seconds
e5e74e5 eloop: Add support for replenishing a registered timeout
b7997e0 Android: Remove obsolete WPA_UNICODE_SSID define
2d39a4d hostapd: Allow hostapd_cli to work on Android
1c6edec nl80211: Work around nl_socket_set_nonblocking on Android
c101bb9 hostapd: Add option to send OBSS scan params
60cdfd7 Android: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER
e40634e Prohibit PNO start during assoc process and in connect state
3526ff0 Android: Add ANDROID_P2P define under BOARD_WLAN_DEVICE
d0b2735 Android: Fix CFLAGS -> L_CFLAGS
9ec8766 P2P: Allow GO P2P Device Address to be used for scan result matching
83eefb4 P2P: Add debug print of P2P Group ID SSID
b6881b5 WPS NFC: Add more debug for NFC Password Token matching
67a88a7 WPS NFC: Add debug log entry on OOB Dev Pw attribute addition
08b2677 Interworking: Use SSID from the BSS entry
5058975 Interworking: Reject BSS based on disallow_aps
6ede8a7 Interworking: Avoid duplicated network blocks
d28f4e4 Interworking: Do not reconnect if already connected
5e1a456 hostapd: Do not start secondary BSS unless interface is enabled
36501a2 hostapd: Verify hostapd_setup_bss calls
54246f8 hostapd: Share a single function for BSS deinit
6d1ca81 Remove unused hostapd_cleanup_iface_pre()
747c85f hostapd: Add more debug prints to deinit path
6023a78 Restore hapd->interface_added tracking to core hostapd
486d2ff hostapd: Deinit ctrl_iface in case of add interface failure
8540e0b hostapd: Fix DETACH command debug prints to avoid use of freed memory
cdf3fb1 Fix removal of a BSS that has not yet been fully initialized
2f99d90 Remove all BSSs on removal of the first one
1493380 drivers: Do not call hostapd_logger()
1281c0a Remove a compiler warning from -O0 build

Change-Id: I0f4905d5310c51c9a4375d811a2e874651687d4f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/hostapd.conf
rc/ap/ap_config.h
rc/ap/gas_serv.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/ieee802_11_ht.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/wps_hostapd.c
rc/common/ieee802_11_defs.h
rc/common/wpa_ctrl.h
rc/drivers/driver_atheros.c
rc/drivers/driver_madwifi.c
rc/drivers/driver_nl80211.c
rc/p2p/p2p_build.c
rc/radius/radius_das.c
rc/utils/eloop.c
rc/utils/eloop.h
rc/utils/eloop_win.c
rc/wps/wps_attr_build.c
rc/wps/wps_registrar.c
pa_supplicant/Android.mk
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/events.c
pa_supplicant/interworking.c
ffd6bf9543a8ca0d7ec8b0075bdbb49b853a3e7d 08-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Set proper path to keystore include dir

Change-Id: I9033416d2d9995a8b9859cf0b93ad32415e13484
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/Android.mk
7823441ee0e1724edca5ec5cc5a2ca9becce307d 08-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "Android: Remove obsolete WPA_UNICODE_SSID define"
88b41937ac9e0b33e22dad0f15894cfc3f3a107a 08-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> am f708dcd0: Prohibit pno start during assoc process and in connect state

* commit 'f708dcd0f0fabe4a22bed1d77e7002f58fb4bc69':
Prohibit pno start during assoc process and in connect state
0cd6a7c06ca0a9ca7ffce22931f984a2e5c504ba 07-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Remove obsolete WPA_UNICODE_SSID define

Change-Id: Ic342eff728b418c2d3d053b4b9b89d81d7c56a62
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
f708dcd0f0fabe4a22bed1d77e7002f58fb4bc69 06-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Prohibit pno start during assoc process and in connect state

Change-Id: I58bc138d5b74b1b62f7a9612c12399083aef1374
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
eb949d589ea14d32d5bac2cf49e955a92dfa5784 07-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Revert "Fix reporting hidden APs during scan"

This reverts commit e25ba1592df19d46a7a1e1a1fca1fb02ebd7be8f.
pa_supplicant/scan.c
641185ebd73d9607756c87b22f6c520ab1846325 07-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Remove obsolete ANDROID defines

Change-Id: I4f0bb7201b7fb9728f10d1362f984cea726c63cd
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
c8c09cfad1d06bc4e5829d9c4014321cfa92284e 06-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Remove obsolete use_multi_chan_concurrent flag

Change-Id: I9d22b2cf406a8a02aeaee08ab7eb4741412982a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
0fdea2c0b1e01dd3f502b86e0e396d98d43b0633 06-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Fix CFLAGS -> L_CFLAGS

Change-Id: I39aadda8a1b7bd5e0f5f546bf0c1f809398ebff3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/Android.mk
4d9ecd87ed66acfb625dbf3867fcd60679855733 06-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Prohibit pno start during assoc process and in connect state

Change-Id: I58bc138d5b74b1b62f7a9612c12399083aef1374
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
b96dad47218788efffa3db0fe7f1b54a7d19e366 05-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 2b6623ab134fff6d96114f5fe329a2f87d5e893a

2b6623a hostapd: Do not terminate process on dynamic interface add failure
217cf49 P2P: Add more debug prints for frequency selection
4dd3f86 P2P: Fix bug in GO frequency selection
9804873 wpa_supplicant: Fix bug in get_shared_radio_freqs
3342c26 wpa_supplicant: Fix updating GO beacons on WFD subelements change
72c12c1 EAPOL: Fix static analyzer warnings for pac_opaque_encr_key
3139270 bgscan: Add global bgscan configuration
efc58df eap_proxy: Re-read IMSI from proxy in Interworking functionality

Change-Id: I006abd3b52fbbd1a7b97059364c72ab0386d5f63
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
EADME
ostapd/main.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/eapol_auth/eapol_auth_sm.c
rc/p2p/p2p.c
rc/p2p/p2p_group.c
rc/p2p/p2p_i.h
pa_supplicant/bgscan.c
pa_supplicant/bgscan.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
4e45558d160f5ae131def0e63ff7f6b2e41d9fe2 05-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Android: P2P: Remove obsolete p2p_search_in_progress

Change-Id: I5c91104eacf2af1e67868a636c5b708cb67d5486
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p.h
cce06667447b5aec83452adb0c15100ada531095 05-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit d4f1a347ceca31fd9cf14070fd000235d5f4e9c1

d4f1a34 Allow AP mode configuration with VHT enabled on 2.4 GHz
bb337dd DFS: Do not use cf1 to override freq for 20 MHz channels
0dfd2c6 Document AP mode startup functions
fee947b hostapd: Use correct wpa_printf verbosity level for message
2fe210c hostapd: Fix multi-BSS configuration file parsing regression
e4ba031 hostapd: Use start_ctrl_iface() from hostapd_add_iface()
bf7f09b Fix AP mode QoS Map configuration to be per-BSS
dc036d9 DFS: Convert hostapd_data use to hostapd_iface
2db938e hostapd: Fill in phyname automatically
5ae6449 hostapd: Add ctrl_iface STATUS command
afadaff Optimize 40 MHz HT co-ex scan on AP
7d6d737 hostapd: Add AP-ENABLED/DISABLED ctrl_iface events
e1c5faf hostapd: Track interface state
f0793bf hostapd: Wait for channel list update after country code change
ae134e1 hostapd: Add ctrl_iface events for ACS
ad08e14 hostapd: Move ctrl_iface initialization to happen earlier
c20cb02 hostapd: Remove hostapd_interface_init2()
4a5deb9 hostapd: Simplify interface initialization
186c905 DFS: Add control interface events for various DFS events
ddf5517 hostapd: Add control interface test commands for radar detection
884f1a3 nl80211: Verify radar event attributes exist before using them
71cdf6b hostapd: Fix ENABLE failure to not remove interface
18ca733 SAE: Fix group selection
65015b2 Replace unnecessary UTF-8 characters with ASCII versions
61323e7 Convert perror/printf calls to wpa_printf
3f134b4 hostapd: Accept RELOG from global control interface
b253e6f hostapd: Use wpa_printf() for hostapd_logger() to stdout
c092d83 P2P: Clear pending group formation data on group removal
9100b66 P2P: Debug print reason for specific SSID for scan
2aec4f3 Allow add-BSS operation to re-use existing netdev
5592065 hostapd: Allow a single BSS to be removed from an interface
2e2fff3 hostapd: Allow a single BSS to be added to an interface
a1fb569 hostapd: Make hostapd_interface_init_bss() available externally
66936c6 hostapd: Make hostapd_init() available externally
390e489 hostapd: Allow the first BSS in a multi-BSS setup to be removed
834ee56 nl80211: Make wpa_driver_nl80211_data::first_bss pointer
748c0ac nl80211: Fix monitor interface reference counting
08e55eb nl80211: Add a debug print for DEL_BEACON
33b0b33 hostapd: Fix error path in hostapd_add_iface()
770ecdf ACS: Do not get stuck while failing to do a subsequent scan
813d4ba DFS: Add support for multi-BSS
954e71d DFS: Reset cac_started properly
6a398dd DFS: Sanitize channel availability checks
32595da DFS: Fix HT40/VHT calculation
0648c3b hostapd: Add -T Linux tracing option
392e68e Set GTK rekey offload information after initial group key handshake
bbc706a nl80211: Add debug prints for NL80211_CMD_SET_STATION
731ca63 Update regulatory change to all virtual interface for the phy
6f2db2f hostapd: Validate configuration parameters on RELOAD command
eff0fd1 hostapd: Move generic configuration functions into src/ap
5afaa06 hostapd: Allow per-BSS (vif) configuration files
ebd79f0 hostapd: Make hostapd_config::bss array of pointers
a781e21 hostapd: Force PSK to be derived again on BSS reload
9f104b0 hostapd: Reuse hostapd_clear_old() for RELOAD command

Change-Id: I7fbb26cbd4a2960af66a4373c0e6bbe5390a4940
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/defconfig
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/accounting.c
rc/ap/acs.c
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/beacon.c
rc/ap/ctrl_iface_ap.c
rc/ap/ctrl_iface_ap.h
rc/ap/dfs.c
rc/ap/dfs.h
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/iapp.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11_shared.c
rc/ap/ieee802_1x.c
rc/ap/wmm.c
rc/common/sae.c
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/driver_test.c
rc/eap_server/eap_sim_db.c
rc/radius/radius_client.c
rc/radius/radius_das.c
rc/radius/radius_server.c
rc/rsn_supp/wpa.c
rc/utils/eloop.c
pa_supplicant/android.config
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/defconfig
pa_supplicant/driver_i.h
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.conf
e6c91e4c8125a2e7b31d176a52644aa9cab146f1 29-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Revert: Android: P2P: Fix restriction of GO channels on A-band

Change-Id: I3618e9bc416f2d9e38871642fb9c73a4902e7495
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_utils.c
68d0e3ed07847339aedfac8e02f50db68c702e52 29-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 32b62704fac6af74f60b2effb173474e11ff089d

32b6270 Android: Fix ARRAY_SIZE() compilation
7617388 Interworking: Report STATUS:sp_type even if domain is not configured
c20bc9d P2P: Remove compiler warning without CONFIG_IEEE80211N
ca9bc5b P2P: Add VHT support
20ea1ca P2P: Add VHT parameter to P2P operations
53cfad4 nl80211: Mark VHT 80 MHz channels
f2112b2 wpa_supplicant: Add CONFIG_IEEE80211AC
6b02335 hostapd: Mask out not-supported VHT capabilities
7f0303d hostapd: Verify VHT 160/80+80 MHz driver support
c781eb8 hostapd: Verify VHT capabilities are supported by driver
b29b012 Fix some VHT Capabilities definitions
7066a8e hostapd: Fix wrong VHT configuration capabilities flags
6651f1f nl80211: Use max tx power from regulatory domain
7ac3616 nl80211: Replace perror() and printf() calls with wpa_printf()
4d9fb08 WPS: Clear known_wps_freq in addition to after_wps
d20c340 Interworking: Clear known_wps_freq for network selection
f3be6ee tests: Allow test case descriptions to be written into database
1bd05d0 Interworking: Force normal scan for network selection
51e9f22 P2P: Add option to allow additional client channels
556b30d P2P: Add option to remove channels from GO use
e7ecab4 Use ARRAY_SIZE() macro
39044a7 Introduce ARRAY_SIZE() macro
2e94624 DFS: Handle radar event when CAC actived correctly
5eaf240 DFS: Fix overlapped() function to check only DFS channels
345276a DFS: Adjust center freq correctly for VHT20/VHT40
1dc17db DFS: Fix available channels list for VHT80
34068ac nl80211: Add debug prints on nl_recvmsgs() failure
10b8592 nl80211: Make eloop sockets non-blocking
5f65e9f nl80211: Abstract handling of sockets on eloop
e8d1168 nl80211: Register for IBSS auth frames before eloop
03610ad Clean up get_seqnum() use for IPN
29179b8 Stop ctrl_iface monitor send loop on reinit failure
a2a535f Remove unnecessary wpa_s->conf checks
3318376 Add explicit buffer length checks for p2p_build_wps_ie()
0f01201 Verify that readlink() did not truncate result
f5eb9da nl80211: Clean up if_add() for hostapd use
a288da6 OpenSSL: Fix memory leak on error path
6cb4f11 nl80211: Fix strerror() value in P2P Dev debug messages
35f8363 DFS: Add forgotten break statement
2f243b8 Remove os_strncpy()
24f051e Replace remainining strncpy() uses with strlcpy()
41c526f P2P: Fix snprintf buffer length for group ifname backup

Change-Id: I2e1506cb9219a5a37efbb2ae0dc180fb081c809f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
rc/ap/acs.c
rc/ap/ap_drv_ops.c
rc/ap/dfs.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/ieee802_11_vht.c
rc/ap/wpa_auth.c
rc/common/ieee802_11_defs.h
rc/crypto/dh_groups.c
rc/crypto/tls_openssl.c
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_bsd.c
rc/drivers/driver_madwifi.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_wext.c
rc/drivers/linux_ioctl.c
rc/eap_common/ikev2_common.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_build.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_utils.c
rc/radius/radius.c
rc/tls/tlsv1_common.c
rc/utils/common.c
rc/utils/common.h
rc/utils/os.h
rc/utils/os_unix.c
rc/wps/wps_attr_build.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README-P2P
pa_supplicant/ap.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/defconfig
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
fc01fd207990a3ea0e0bc2f4d98746e559474c9f 24-Oct-2013 Jouni Malinen <jouni@qca.qualcomm.com> am b4d426da: (-s ours) Fix ENABLE_NETWORK not to reconnect in disconnected state (DO NOT MERGE)

* commit 'b4d426dac2751d1bdd93393fd7b679b445fd0565':
Fix ENABLE_NETWORK not to reconnect in disconnected state (DO NOT MERGE)
b4d426dac2751d1bdd93393fd7b679b445fd0565 23-Oct-2013 Jouni Malinen <jouni@qca.qualcomm.com> Fix ENABLE_NETWORK not to reconnect in disconnected state (DO NOT MERGE)

DISCONNECT followed by ENABLE_NETWORK ended up starting a scan for a new
connection due to wpa_supplicant_enable_one_network() setting
wpa_s->reassociate = 1. This was done regardless of wpa_s->disconnected
being 1 which should imply that wpa_supplicant should not try to connect
before asked explicitly with REASSOCIATE or RECONNECT.

Fix this by making ENABLE_NETWORK setting of reassociate = 1 and
starting of scans for connection conditional on wpa_s->disconnected ==
0. This will make ENABLE_NETWORK trigger a connection only if
wpa_supplicant is already in a state where it would try to connect if
there are any enabled networks.

Bug: 10483405

Change-Id: Iae606745270f6f3185d5705947f8ccd46bc3a904
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/wpa_supplicant.c
4ce9c87407c036fc83eb5a6044ddf976c86f53fc 24-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit fa56315cfc9ebaff2b210ed99d43dda9b16bdf56

fa56315 eap_proxy: Add context data pointer to the get_imsi call
07041c6 eap_proxy: Confirm eap_proxy initialization before reading SIM info
47d986e P2P: Check Action frame payload match before accepted TX status
d259249 Fix ENABLE_NETWORK not to reconnect in disconnected state
677cf19 hostapd: Select any supported channel if ACS fails
20f9cb1 hostapd: Allow ACS to deal with partial survey data
3645fd5 hostapd: Propagate ACS errors to iface setup
0e1d0b3 hostapd: Don't get stuck after failed ACS
af8a827 Make frequency range list routines more general
941dae0 P2P: Add more user friendly debug print of channel lists

Change-Id: I942dbbc0cb92f4e09626ec6ea17f6ea583c17f1a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/acs.c
rc/ap/acs.h
rc/ap/hw_features.c
rc/eap_peer/eap_proxy.h
rc/eap_peer/eap_proxy_dummy.c
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_utils.c
rc/utils/common.c
rc/utils/common.h
pa_supplicant/ctrl_iface.c
pa_supplicant/offchannel.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
051af73b8f8014eff33330aead0f36944b3403e6 22-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 538922a628d4f5403b9a96b171a59235bcb3d921

538922a dbus: Add boolean AllowRoam option to Scan() method options dictionary
c6f5dec Don't start second scan when changing scan interval
cd3b070 nl80211: Fix DFS radar event parsing
2b72df6 nl80211: Free BSS structure even if netdev does not exists
41cc50d nl80211: Update send_action_cookie on AP-offchannel-TX path
313424d GAS: Add support for multiple pending queries for the same destination
cbc5484 GAS: Do not start new scan operation during an ongoing GAS query
c377514 GAS: Delay GAS query Tx while scanning/connecting
24c694b GAS: Delay GAS query Tx while another query is in progress
7255983 WPS: Clear after_wps from number of new locations
73b54d6 P2P: Fix Operating Channel in Invitation Request for operating group
dc46fd6 P2P: Cancel offchannel TX wait on Invitation Response RX
0c92963 D-Bus: Clean up debug print for P2P invitation result
8d82c21 P2P: Fix PD retry channel on join-a-group case
d285888 P2P: Add GO BSS entry details to debug log on join-a-group
512629a P2P: Accept Invitation Response non-success without Channel List
e241b1b eap_proxy: Fix IMSI fetch for home vs. visited network determination
db13605 EAP-AKA/AKA' peer: Allow external USIM processing to be used
569ccf7 EAP-SIM peer: Allow external SIM processing to be used
84dc137 hlr_auc_gw: Add GSM-AUTH-REQ command
a5d44ac EAP peer: Add framework for external SIM/USIM processing
7e8bc7d eapol_test: Initialize BSS lists
bceb843 Send CTRL-RSP command response before processing EAPOL update
b607796 eapol_test: Fix external EAP request mechanism
94de082 eapol_test: Initialize wpa_s->global to fix ctrl_iface
f07bba3 Android: Add dfs.c into build
0cf0af2 WNM: Set Disassoc Imminent flag in ESS Disassoc Imminent frame
f47c145 Interworking: Add required_roaming_consortium parameter for credentials
a83e574 GAS: Update timeout from TX status handler
e88060e HTTP server: Allow TCP socket to be reused
9bc3386 Add test option for specifying hardcoded BSS Load element
9c7e43a Define BSS Load element id
56f5af4 Interworking: Add support for QoS Mapping functionality for the STA
850e1c2 atheros: Add support for QoS Mapping configuration
c551700 Interworking: Add support for QoS Mapping functionality for the AP
ac1bc54 Interworking: Add domain_suffix_match for credentials
463c8ff Interworking: Add support for multiple home FQDNs
01f809c Add AAA server domain name suffix matching constraint
be7963b OpenSSL: Fix code indentation in OCSP processing
899cc14 hostapd: Add support for DFS with 160 MHz channel width
6de0e0c Mark DFS functions static and rename them
58b73e3 hostapd: DFS with 40/80 MHz channel width support
846de15 DFS: Add more parameters to radar events
04e8003 nl80211: Use struct hostapd_freq_params with start_dfs_cac
72c753d hostapd: Split hostapd_set_freq to helper function
e76da50 hostapd: Add AP DFS support

Change-Id: Ie9ed4662ba6d81e6d8b14bccb29ffa192becf0f2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/hlr_auc_gw.c
ostapd/hostapd.conf
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/beacon.c
rc/ap/dfs.c
rc/ap/dfs.h
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hw_features.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11.h
rc/ap/ieee802_11_shared.c
rc/ap/sta_info.h
rc/common/defs.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/crypto/tls.h
rc/crypto/tls_openssl.c
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_nl80211.c
rc/eap_peer/eap.c
rc/eap_peer/eap.h
rc/eap_peer/eap_aka.c
rc/eap_peer/eap_config.h
rc/eap_peer/eap_i.h
rc/eap_peer/eap_sim.c
rc/eap_peer/eap_tls_common.c
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_pd.c
rc/wps/http_server.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README-HS20
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_winreg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/driver_i.h
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/gas_query.h
pa_supplicant/hs20_supplicant.c
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
3b7e16d414e38c8856c4712f3a0768c89689cbc3 17-Oct-2013 Ed Heyl <edheyl@google.com> am ac427985: merge in klp-release (no-op)

* commit 'ac427985df589ec36369ed2ae9d266d83f420e5c':
ac427985df589ec36369ed2ae9d266d83f420e5c 17-Oct-2013 Ed Heyl <edheyl@google.com> merge in klp-release (no-op)
9657139ca0bbea9a84e0a3c7e9438d1f53c9ed24 14-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 5079392954c80573234952772dc39dbb5d3179ca

5079392 Increase buffer size and prevent write beyond buffer end
ded22b5 hostapd: Fix segfault after ACS when flushing STAs
7e910b7 WPS NFC: Cancel scheduled scan before attempting a scan
24d110d Replace printf with wpa_printf debug message
b72e14e P2P: Do not allow P2P client connection without P2P IE from GO
5df7414 P2P: Allow persistent group determination based on Beacon frame
aaeb9c9 P2P: Allow GO to be discovered based on Beacon frame
b16696f P2P: Show p2p flag in debug info for scan results
bb50ae4 P2P: Show P2P flag in BSS entries also based on Beacon frames
ff57398 P2P: Do not drop P2P IEs from BSS table on non-P2P scans
adeb4f5 P2P: Make sure wait for the first client gets stopped
f22f274 P2P: Clone 'disable_scan_offload' parameter for p2p group
63ce59d P2P: Increase Invitation Request timeouts
acdd0fc P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal

Change-Id: I464e59b59ac0c15af1b72ca0eda00e55c699c1c7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_1x.c
rc/ap/sta_info.c
rc/p2p/p2p_invitation.c
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/wps_supplicant.c
e0ae542d4106cf55a8d72c8c82561b2faf736a11 13-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
8cb3d31a15d79d476983064ee67804c3d9fb0081 11-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> am edcc8d62: Android: P2P: Fix restriction of GO channels on A-band

* commit 'edcc8d627804a0c1140542da2380c83a8c03b7a9':
Android: P2P: Fix restriction of GO channels on A-band
edcc8d627804a0c1140542da2380c83a8c03b7a9 08-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Android: P2P: Fix restriction of GO channels on A-band

Bug: 11105901

Change-Id: Ibe8e85f47e95177700deedccb408f1eec85b8f3d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_utils.c
453540dd4da15bf508345b857c458cb5b00106ba 09-Oct-2013 Ed Heyl <edheyl@google.com> am 93d8bfbc: merge in KFS78N (no-op)

* commit '93d8bfbc7b0c16192ab087596e831d2bf59f41b2':
Android: P2P: Restrict GO channels on A-band
2f704644f85da6f796e287427ffef048520d7b35 09-Oct-2013 Ed Heyl <edheyl@google.com> am 710e96ac: merge in KQS81M

* commit '710e96acab5be36d98876570e81a49bccff8ae33':
93d8bfbc7b0c16192ab087596e831d2bf59f41b2 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KFS78N (no-op)
710e96acab5be36d98876570e81a49bccff8ae33 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KQS81M
5605286c30e1701491bd3af974ae423727750edd 04-Oct-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 8b3b803ab9fe69650da7e3b2ee9e44f0f054ee0a

8b3b803 Include Extended Capabilities element based on scan results
6903ee6 P2P Extend postponing of concurrent scans for persistent GO
77e3094 hlr_auc_gw: Fix max_chal value validation
3e6547b hlr_auc_gw: Add support for processing command line operations
2b5b875 EAP-AKA server: Fix AUTS processing
9a50ee6 hlr_auc_gw: Update file comments to mention Milenage
5388dc9 Document use of Linux capabilities instead of privileged process
a771c07 Add driver status information to control interface
739faee nl80211: Add some more debug prints for mgmt frame TX
f78f278 nl80211: Fix off-channel Action frame TX from GO with use_monitor
298f518 Get rid of compiler warning in no-CONFIG_CTRL_IFACE builds
ea61aa1 Add no_ctrl_interface config param to clear ctrl_interface
25b65a1 Make sure updated BSS entry does not get added twice to the list
bbc6c72 P2P: Use group formation timeout on persistent group GO
41f8532 P2P: Extend group formation timeout on GO to first data connection
20625e9 P2P: Remove P2P groups on process termination
76fe79e Register wpa_msg callback even if only global ctrl_iface is used
af96448 nl80211: Add more debug prints for send_mlme operations
5d4c78f nl80211: Reset nlmode to station on leaving IBSS
0249c12 Avoid compiler warning with CONFIG_NO_STDOUT_DEBUG=y
ed1bf01 Allow hostapd config file for dynamically added interface
97bacf7 Do not clear hostapd configuration parameters on disable-iface
66f4dd1 hostapd: Fix couple of deinit path cases to clear pointers
f18b781 nl80211: Print more debug info on management frame RX information
89286e9 Re-open ctrl_iface socket on some failure cases as a workaround
3ca96df atheros: Compile fix for driver code not defining IEEE80211_APPIE_FRAME_WNM
762c92a OpenSSL: Split OCSP peer_cert/peer_issuer debug output into parts
f224cf0 HS 2.0: Allow printf format parsing with language:name strings
913c19c Fix wpa_config_parse_string() to null terminate printf decoded values
04e533e Fix language string length validation in parse_lang_string()
742e715 Simplify ctrl_iface sendto() use
6668efd Clear frequency list on empty value
1a9f247 Make scan_freq field to be saved by save_config
aa78cd3 Drop EAP packet with code 10 before EAPOL state machine processing
3cc247a Use configured sched_scan interval for the PNO scan
d047ae6 WPS: Ignore PBC-to-PIN change from M1 to M2 as a workaround
79986bf Print ctrl_iface sendto() failures into debug log
eab2b50 P2P: Cancel group formation timeout on client connection
00eb299 P2P: Fix operation channel configuration update

Change-Id: I9269e23bc8019b951c2a2d3c707562b2e006148b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hlr_auc_gw.c
ostapd/hostapd.conf
rc/ap/hostapd.c
rc/ap/vlan_init.c
rc/ap/wpa_auth_glue.c
rc/crypto/tls_openssl.c
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_nl80211.c
rc/eap_server/eap_server_aka.c
rc/eapol_supp/eapol_supp_sm.c
rc/utils/common.c
rc/wps/wps_enrollee.c
pa_supplicant/README
pa_supplicant/bss.c
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/driver_i.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
5ec058d301fd12b42f3bf57c74ba6612becd0893 01-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
73b28cc4bd1d5efa3534ad9e28365fea9a62ffd3 30-Sep-2013 Sunil Dutt <c_duttus@qti.qualcomm.com> TDLS: Do not start concurrent TDLS setup

A new TDLS request shall transmit TPK M1 frame with a unique INonce.
Thus a new explicit request would fail an ongoing TDLS negotiation with
the error "TDLS: FTIE SNonce in TPK M3 does not match with FTIE SNonce
used in TPK M1" if the peer happens to receive two M1 frames before an
M3 frame. Check for the ongoing negotiation with the peer and do not
start a new one if we are already in a setup negotiation with the peer.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/tdls.c
8b43e82b5aa16d167d3e2696b7827c412b0e0a00 30-Sep-2013 Sunil Dutt <c_duttus@qti.qualcomm.com> TDLS: Use wpa_tdls_disable_peer_link() in TPK M1 processing

This function is used only with external setup, so this can cleaned up
to use simpler design.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/tdls.c
d0ef38b52c069e34102b38dafbbc1fe055364ae8 30-Sep-2013 Sunil Dutt <c_duttus@qti.qualcomm.com> TDLS: Use wpa_tdls_disable_peer_link() to avoid peer search

There is no need to go through the peer list when we already have a
pointer to the specific peer entry.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/tdls.c
38ffd8879e7990491033bf20568212e8c3472b48 30-Sep-2013 Sunil Dutt <c_duttus@qti.qualcomm.com> TDLS: Use helper function for disable link operation

This is called from number of locations and it is more efficient to use
a new helper function instead of wpa_tdls_disable_link() that would do
peer address search from the list of peers.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/tdls.c
6a9f522e56dae5b1fff00642e27b82e82772dcf7 30-Sep-2013 Sunil Dutt <c_duttus@qti.qualcomm.com> TDLS: Clean up wpa_tdls_teardown_link() uses

Making this function be used only for external setup case simplifies the
implementation and makes core wpa_supplicant calls in ctrl_iface.c and
events.c consistent.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/tdls.c
pa_supplicant/events.c
6102472da23e48cb1406b87ec767f4fd9a40a85d 15-Sep-2013 Sunil Dutt <c_duttus@qti.qualcomm.com> TDLS: Do not modify RNonce for an TPK M1 frame with same INonce

There is no point in updating the RNonce for every obtained TPK M1 frame
(e.g., retransmission due to timeout) with the same INonce (SNonce in
FTIE). Update RNonce only if a TPK M1 is received with a different
INonce (new TDLS session) to avoid issues with two setup exchanges
getting mixed and exchange failing due to mismatching nonces ("TDLS:
FTIE ANonce in TPK M3 does not match with FTIE ANonce used in TPK M2").

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/tdls.c
adce9cf73c2237aff40a49fc3d0b315711f291d8 15-Sep-2013 Sunil Dutt <c_duttus@qti.qualcomm.com> TDLS: Disable the created link on a failed TDLS handshake

Clear the peer information and disable the created link on a
failed TDLS setup negotiation. This is needed to avoid leaving
TDLS setup pending and to return to the AP path in case anything
goes wrong during the setup attempt.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/rsn_supp/tdls.c
24a7d89f2ebdd98e7c6930c3e09861c4659a5203 29-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
7a6c830dbfaa00fa8918ab9065374c3d8b87f874 27-Sep-2013 Jouni Malinen <jouni@qca.qualcomm.com> Fix possible freed-memory use in BSS table updates

If there are large number of BSSes in the scan results, BSS table update
could have added a BSS entry to the last_scan_res in a case where that
BSS entry got just deleted. This would happen only if there are more
than bss_max_count (by default 200) BSSes and if at least bss_max_count
of those BSSes are known (match a configured network). In such a case,
wpa_bss_add() could end up allocating a new BSS entry and return a
pointer to that entry even if it was the one that ended up getting freed
to keep the BSS table length within the limit. This could result in
freed memory being used and the process crashing (likely with segfault)
when trying to access information from that BSS entry.

Fix the issue by removing the oldest BSS entry before linking the new
entry to the table. This makes sure the newly added entry will never get
picked up as the one to be deleted immediately.

Bug: 10964663

Change-Id: I495dd2503127263746a69c9ef040c9e62fec0bda
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/bss.c
a15675be6cf7e0fab1b544739383d92b21e64f1f 18-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
eb76a720a5c695e876e75171add21c3787100ebd 18-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
03b5cdf515ae7259d67b33c22d829495ac80e631 15-Sep-2013 Hardik Kantilal Patel <hkpatel@qti.qualcomm.com> P2P: Prefer 20 MHz operating channels on 5 GHz band over 2.4 GHz

When no other user preference is specified, opt to use an operating
channel that allows 5 GHz band to be used rather than 2.4 GHz.
Previously, this was already done in practice for HT40 channels since no
such channel is enabled for P2P on 2.4 GHz. This commit extends this to
apply 5 GHz preference for 20 MHz channels as well.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/p2p/p2p_go_neg.c
b4fc3eeed446f7e1943c72b2a3d98f0707e6af5b 16-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Android: P2P: Restrict GO channels on A-band

Bug: 10641114

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

Conflicts:
src/p2p/p2p_utils.c
rc/p2p/p2p_utils.c
e3b0dce889225eda34ecc6455eaeeaa5b12b4475 16-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Android: P2P: Restrict GO channels on A-band

Bug: 10641114

Change-Id: I621ef6d5e45392d86211bc3936e85b876b96aec4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_utils.c
7bcf2d687c7ec924169c68e514ee43be5d0e95a9 16-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-factoryrom-release history after reset to klp-release
3bdda0eea1d423ad6feac810ceee94d75761d667 12-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Android: P2P: Restrict GO channels on A-band by locale

Bug: 10641114

Change-Id: I9bb5e6f816ae84363487d77a8c6ddd1b4ae6ae0f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_utils.c
9432e129bab61fa2bcd91efcf608abb0d0aec28e 12-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Android: P2P: Remember country locale

Bug: 10641114

Change-Id: Iab32a76b277cc8195f47a02fb8e6936ff2529aaa
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
51a47d533b6bf0efff06cc80195a588852a45058 10-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Android: P2P: Fix frequency choice if multichannel supported

Bug: 10513949

Change-Id: Id9e5b2560630049a6ca5f74e3785d4a2c2be3124
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
3733ef3f86d438d165bb13eb3b41415c3410be85 09-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Android: Clean entire socket directory

Despite interface (and group) related sockets are not used
for control, they are created and may be left.

Bug: 10585306

Change-Id: I7cf49403337afc2db552c094029390c2cbd57c0f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/wpa_ctrl.c
391c59f0632df8db1c325da1d31d479b2eedce45 03-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit b2b688d18d40cd667d0faa149b4a7172166b3bd4

b2b688d P2P: Fix crash when failed to create GO interface
6197169 WPS NFC: Fix build without CONFIG_AP=y
e1ae5d7 SAE: Fix build without CONFIG_AP=y
813e7b3 P2P: Remove group from timeout on PSK failure
5bf9a6c P2P: Add event messages for possible PSK failures on P2P groups
eac8dab P2P: Document per-client keys and p2p_remove_client
43c693c P2P: Do not store duplicate PSK entries for the same device
f2c5660 P2P: Add a command for removing a client from all groups
01a57fe P2P: Maintain list of per-client PSKs for persistent groups
759fd76 P2P: Select PSK based on Device Address instead of Interface Address
94ddef3 P2P: Make peer's P2P Device Address available to authenticator
52177fb P2P: Store P2P Device Address in per-device PSK records
05766ed P2P: Allow per-device PSK to be assigned
698e921 wpa_cli: Add tab completion for p2p_set field values
0b5fb86 P2P: Stop listen state when listen-only duration is over
02a3e5c wpa_cli: Allow first DISCONNECTED event to be reported
cdf8bfa Disallow WEP configuration in WPA network
731ef43 D-Bus: Fix per-iface object unregistration on not existing objects
447969e D-Bus: Do not send network notification for all P2P groups
eb32460 Fix switching from EAP-SIM to EAP-AKA/AKA'
f2b3f4d P2P: Allow P2P functionality to be disabled per interface
50f4f2a hostapd: Add Automatic Channel Selection (ACS) support
43ee470 P2P: Immediate group removal in GC in case of deauthentication
fcf2052 Fix MNC length for Swisscom SIM cards

Bug: 10606228, 10513949

Change-Id: I63ba0e2ab4fa76e6afa7a34be42e8e847e1511b0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/config_file.c
ostapd/defconfig
ostapd/hostapd.conf
rc/ap/acs.c
rc/ap/acs.h
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/ieee802_11.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_i.h
rc/ap/wps_hostapd.c
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/eap_peer/eap.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/wps/wps.h
rc/wps/wps_registrar.c
pa_supplicant/README-P2P
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/config.c
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_helpers.c
pa_supplicant/events.c
pa_supplicant/ibss_rsn.c
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/tests/test_wpa.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
92c368d56f46a4e648b441085707c1381b5e5f63 29-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit commit add7add09d72c3294c63a113635d69b766acf504

add7add IBSS RSN: Add a timeout for Authentication frame exchange
c1c0b35 P2P: Postpone concurrent scans when waiting for first client as GO
6fb7b58 IBSS RSN: Work around Data RX vs. Authentication RX race condition

Bug: 10513949

Change-Id: Ic4d77c94a5b6e4729cd798f7b033e3ea5b2481cc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ibss_rsn.c
pa_supplicant/ibss_rsn.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant_i.h
b7b4d0ec07161a6d76c40ba7ef1306e82fbb7e15 26-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit 853b49a030c00fd6b2dde14e183ca2bf108eaa16

853b49a tests: Increase test_ap_wps_init connection timeout
28de68a P2P: Update peer operating channel from GO Negotiation Confirm
6701fdc P2P: Use the first pref_chan entry as operating channel preference
99d7c76 P2P: Add more debug info on operating channel selection
8d660e0 P2P: Add GO negotiation results into the P2P-GO-NEG-SUCCESS event
2c6f8cf Replace perror() with wpa_printf(strerror) in ctrl_iface calls
e743db4 IBSS RSN: Add IBSS-RSN-COMPLETED event message
4c55901 P2P: Add state info to global STATUS command
ae8c27f Add STATUS command to global control interface
42868f1 Add SAVE_CONFIG command to global control interface
1b9b31c Add SET command for global control interface
0185007 hostapd: Add survey dump support
245e026 hostapd: Split up channel checking into helpers
ba873bd wired: Wait for the link to become active before sending packets
d393de1 P2P: Validate the freq in p2p_group_add
973622c wpa_supplicant: Fix AP mode frequency initialization
d99ca89 P2P: Skip non-P2P interface in p2p_group_remove *
239abaf WPS: Set currently used RF band in RF Bands attribute
bf83eab nl80211: Start P2P Device when rfkill is unblocked
60b13c2 nl80211: Do not change type to station on P2P interfaces
e0591c3 wpa_supplicant: Reduce wait time for control interfaces
5046eb4 P2P: Allow separate interface GO to disconnect low-ack STAs
5bcd5c5 FT RRB: Clear pad field to avoid sending out uninitialized data
b378c41 nl80211: Fix deinit path to unregister nl_mgmt socket
a235aca Fix DETACH command debug prints to avoid use of freed memory
8d6e035 Make global UNIX socket non-blocking for ctrl_iface
86bd141 Change WEP network selection to reject WPA/WPA2 APs
2e145e9 WPS: Fix failure path to allow WSC_NACK and EAP-Failure to be exchanged
3351a38 WPS: Add control interface command for fetching latest status
e96872a WPS: Track peer MAC address from the last operations
ae23935 WPS: Track PBC status
61b6520 WPS: Track result of the latest WPS operation
50396e2 WPS: Add PBC mode activated/disabled events
961750c WPS: Share a common function for error strings
30158a0 nl80211: Update the assoc_freq during connect
83e7bb0 nl80211: Add more debug prints for DEL_STATION commands

Bug: 9056601

Change-Id: I8bc671eb13f4c2c388a4c15cf1ba968c24c9656a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ctrl_iface.c
ostapd/hostapd_cli.c
rc/ap/ap_drv_ops.h
rc/ap/drv_callbacks.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/wpa_auth_ft.c
rc/ap/wps_hostapd.c
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_common.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_wired.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_utils.c
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_common.c
rc/wps/wps_defs.h
rc/wps/wps_dev_attr.c
rc/wps/wps_dev_attr.h
rc/wps/wps_enrollee.c
rc/wps/wps_i.h
rc/wps/wps_registrar.c
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_udp.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/events.c
pa_supplicant/ibss_rsn.c
pa_supplicant/ibss_rsn.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wps_supplicant.c
0c18dcd2bd94644d9215995225c076d146d6ad82 17-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> P2P: Add commands for p2p redirection

Bug: 9056601

Change-Id: I6d78433df656c24af74a6825624c68231a4bf87d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
eaf261d3b8eef1dcb8d645e0cd2b9016bb66cdfd 15-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> Remove obsolete parameter from p2p_sd_service_update()

Bug: 9056601

Change-Id: Ia461ff500df50f1b97ad446dc14d43fa3513677b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.h
rc/p2p/p2p_i.h
rc/p2p/p2p_sd.c
pa_supplicant/ctrl_iface.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
5393a0f77c5281735888bd9dcf8d8abeb5961461 08-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit d2ba3d6bd9336ef8fd761a0cc7999824d4c4da41

d2ba3d6 VLAN: Simplify no-WEP with VLAN check
d66dcb0 WEP: Remove VLAN support from hostapd
646f12a bsd: Add a commit routine
32dc6a3 bsd: Mark define sta_set_flags() only for hostapd
70a867c bsd: Mark the interface down before opening the routing socket
89f4690 bsd: Compute the RSSI level
5dd82c6 bsd: Set IEEE80211_KEY_NOREPLAY in IBSS/AHDEMO mode
cb76af8 bsd: Skip SIOCSIFFFLAGS ioctl when there is no change.
7239ea7 nl80211: Add stop AP mode event API

Change-Id: Ib1c41f2ed18299451f05d0adf808b8b560522c86
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/hostapd.c
rc/ap/ieee802_1x.c
rc/drivers/driver_bsd.c
rc/drivers/driver_nl80211.c
d5c075b0c218277d0f926daf1f9eff974b9656dc 05-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> Cumulative patch from commit c2db79f2376c61c21918162fb2222a66c029fa48

c2db79f VLAN: Remove vlan_tail
f7b4ef2 TDLS: Handle transmission failures of TPK Handshake messages
a2ea8d6 P2P: Fix invalid remain-on-channel duration for frame TX
cbf41ca P2P: Do not delay retries on failure during group formation
dc01de8 nl80211: Fix TDLS key configuration to not set TX key index

Change-Id: Id2418699c3ce49a7e198ab9c0d718ab4a713df62
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
rc/ap/ap_config.h
rc/ap/sta_info.c
rc/ap/vlan_init.c
rc/drivers/driver_nl80211.c
rc/rsn_supp/tdls.c
pa_supplicant/offchannel.c
pa_supplicant/wpa_supplicant.c
c2ebb4b85d69b65f552fee71ac68f44e8d87b39e 24-Jul-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 932659696e2755bb1ecd6a27e1968fd27eef4948

9326596 nl80211: Remove unused WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT
0d08efa P2P: Use the number of concurrent channels in P2P flows
a21816a Use wpa_drv_shared_freq() if get_radio_name() is not supported
53c5dfc Change share_vif_oper_freq() to handle multiple freqs
4752147 nl80211: Report the number of concurrent support channels
d7df0fa Clean up wpa_supplicant_event() with deauth/disassoc helper functions
fd9f170 Remove unnecessary nested ifdef CONFIG_AP
13adc57 IBSS RSN: Add peer restart detection
b21990b nl80211: Register for AUTH frames when joining an IBSS network
c91f796 nl80211: Support not specifying the frame frequency
ec384c5 IBSS RSN: Fix disconnect() with internal SME
ed07764 nl80211: Remove redundant assignment of ifindex
4ed8d95 TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not external
831770b Cancel delayed scheduled scan when wpa_supplicant cleans up
69dd296 WDS: Fix WEP usage with nl80211 wds_sta=1
c8ebeda wpa_supplicant: Add support for VHT BSS membership selector
3f9a813 hostapd: Add a config option to control beaconing
182b2e5 Add missing host_to_le32() for big endian hosts
3f53c00 nl80211: Ignore disconnect event in case of locally generated request

Change-Id: Ia7368e71ae40966a92970ac82b002c09a7971d41
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.conf
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/hostapd.c
rc/ap/ieee802_11.c
rc/ap/sta_info.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.h
rc/utils/common.h
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
pa_supplicant/events.c
pa_supplicant/ibss_rsn.c
pa_supplicant/ibss_rsn.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/sme.c
pa_supplicant/sme.h
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
a1c1be9e75d20e064c9ffbd1d2f51257881c369b 20-Jul-2013 The Android Open Source Project <initial-contribution@android.com> am 18493732: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '184937322b767748f4d65758616cc9db2d670564':
Mark interface disconnected on removal request, DO NOT MERGE
Do not try auto connect mechanism in disconnected state, DO NOT MERGE
Do not add BSS to blacklist on local disconnection request, DO NOT MERGE
eec38ff40c4d190d3e0155c790dbb419962ef6e0 20-Jul-2013 Jouni Malinen <jouni@qca.qualcomm.com> am 63c1477e: (-s ours) am b75d8b67: Mark interface disconnected on removal request, DO NOT MERGE

* commit '63c1477ea9052118e3a991c903655b6ed04bd7b9':
Mark interface disconnected on removal request, DO NOT MERGE
c5aa76112eb8c69e76b25d3f4b7c6cb1f56d74c6 20-Jul-2013 Jouni Malinen <jouni@qca.qualcomm.com> am 82c2c233: (-s ours) am 26a545dc: Do not try auto connect mechanism in disconnected state, DO NOT MERGE

* commit '82c2c2331d5d0bccf5d49f03347c9a23285a305b':
Do not try auto connect mechanism in disconnected state, DO NOT MERGE
33dcfd56d86438bc8ca83bc74d97874880e584fe 20-Jul-2013 Jouni Malinen <jouni@qca.qualcomm.com> am f7f24ff1: (-s ours) am 74d2224e: Do not add BSS to blacklist on local disconnection request, DO NOT MERGE

* commit 'f7f24ff14fa691903849942444025175f627e873':
Do not add BSS to blacklist on local disconnection request, DO NOT MERGE
184937322b767748f4d65758616cc9db2d670564 19-Jul-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I0e4867b931bdee95e581e2769b182814cb23a531
63c1477ea9052118e3a991c903655b6ed04bd7b9 19-Jul-2013 Jouni Malinen <jouni@qca.qualcomm.com> am b75d8b67: Mark interface disconnected on removal request, DO NOT MERGE

* commit 'b75d8b6774b7d464236a4e029750d0f29dc27b37':
Mark interface disconnected on removal request, DO NOT MERGE
82c2c2331d5d0bccf5d49f03347c9a23285a305b 19-Jul-2013 Jouni Malinen <jouni@qca.qualcomm.com> am 26a545dc: Do not try auto connect mechanism in disconnected state, DO NOT MERGE

* commit '26a545dc8d839bfa32e8cc2d52a6c63adfa4daf7':
Do not try auto connect mechanism in disconnected state, DO NOT MERGE
f7f24ff14fa691903849942444025175f627e873 19-Jul-2013 Jouni Malinen <jouni@qca.qualcomm.com> am 74d2224e: Do not add BSS to blacklist on local disconnection request, DO NOT MERGE

* commit '74d2224ee5ae007985ed5f26df19cf20c2841ec2':
Do not add BSS to blacklist on local disconnection request, DO NOT MERGE
e7ccc40240b72272737d4f25041e4b1374f20b09 12-May-2013 Jouni Malinen <jouni@qca.qualcomm.com> Mark interface disconnected on removal request, DO NOT MERGE

This cleans up debug log by not trying to process the disconnection
event as a failure that could result in blacklist addition and auto
connect attempt. These are pointless operations since the interface is
going to removed immediately after this.

Bug: 8785804
Change-Id: I2406d9b9bd9f0a83ae9fd0b0962f1134fda2bb9e
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
pa_supplicant/wpa_supplicant.c
7f6ddc3bc00fcb26a8c8fc9289acd1016577cc3d 12-May-2013 Jouni Malinen <jouni@qca.qualcomm.com> Do not try auto connect mechanism in disconnected state, DO NOT MERGE

This cleans up debug log by not requesting the auto connect on
dissassociation event if we are already in disconnected state and would
not try to connect anyway.

Bug: 8785804
Change-Id: I3ba6cc4c64dd714c0689a39339b6f0da5a06857e
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
pa_supplicant/events.c
17cac74a3a7eb98763f34509f2ec6831265f71e3 12-May-2013 Jouni Malinen <jouni@qca.qualcomm.com> Do not add BSS to blacklist on local disconnection request, DO NOT MERGE

There is no point in marking a BSS temporarily blacklisted based on a
connection failure or disconnection case if that happens as a result of
a local request to disconnect. The blacklist entry could result on
unexpected BSS getting selected on the next connection attempt. In
addition, the code to try to find another BSS within the ESS could
result in scanning a single channel on the next attempt. Fix these
issues by handling the connection failure events only if we are not in
disconnected state (i.e., would try to reconnect after this
automatically).

Bug: 8785804
Change-Id: Iae119c292f5f45b78359dd67317d7d8206cb4cf7
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
pa_supplicant/wpa_supplicant.c
b75d8b6774b7d464236a4e029750d0f29dc27b37 12-May-2013 Jouni Malinen <jouni@qca.qualcomm.com> Mark interface disconnected on removal request, DO NOT MERGE

This cleans up debug log by not trying to process the disconnection
event as a failure that could result in blacklist addition and auto
connect attempt. These are pointless operations since the interface is
going to removed immediately after this.

Bug: 8785804
Change-Id: I2406d9b9bd9f0a83ae9fd0b0962f1134fda2bb9e
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
pa_supplicant/wpa_supplicant.c
26a545dc8d839bfa32e8cc2d52a6c63adfa4daf7 12-May-2013 Jouni Malinen <jouni@qca.qualcomm.com> Do not try auto connect mechanism in disconnected state, DO NOT MERGE

This cleans up debug log by not requesting the auto connect on
dissassociation event if we are already in disconnected state and would
not try to connect anyway.

Bug: 8785804
Change-Id: I3ba6cc4c64dd714c0689a39339b6f0da5a06857e
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
pa_supplicant/events.c
74d2224ee5ae007985ed5f26df19cf20c2841ec2 12-May-2013 Jouni Malinen <jouni@qca.qualcomm.com> Do not add BSS to blacklist on local disconnection request, DO NOT MERGE

There is no point in marking a BSS temporarily blacklisted based on a
connection failure or disconnection case if that happens as a result of
a local request to disconnect. The blacklist entry could result on
unexpected BSS getting selected on the next connection attempt. In
addition, the code to try to find another BSS within the ESS could
result in scanning a single channel on the next attempt. Fix these
issues by handling the connection failure events only if we are not in
disconnected state (i.e., would try to reconnect after this
automatically).

Bug: 8785804
Change-Id: Iae119c292f5f45b78359dd67317d7d8206cb4cf7
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
pa_supplicant/wpa_supplicant.c
0d16a24facb038db649f4baeb6e6709880adfd98 12-Jul-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "Accumulative patch from commit 1075b2957169d8f9d6dddd7679339c751dc9515b"
34af306c42b7ccf956508e7cd23f0ba90606e360 11-Jul-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 1075b2957169d8f9d6dddd7679339c751dc9515b

1075b29 P2P: Report group formation failure on error to start GO mode
b62b29e Do not block on ctrl_iface monitor events
eb7ddbf WPS: Stop SSDP service before freeing the pending entries
98cbc0a Remove forgotten Xcode defines
0b9d3b2 Interworking: Relax 3GPP info PLMN matching for MNC
c7a67a7 WPS: Disconnect when removing existing WPS network block
fe65847 EAP-EKE: Add server implementation
7e7610d EAP-EKE: Add peer implementation
489202d EAP-SAKE: Use configured server identity
a607b42 EAP-PSK: Use configured server identity
15b042b EAP-MSCHAPv2: Use configured server identity
162865b EAP-IKEv2 server: Use configured server identity
8f89d82 EAP-GPSK server: Use configured server identity
67fe933 Add server identity configuration for EAP server
06aeff5 dbus: Register the AutoScan method call at the right place
78f79fe P2P: Do not add ctrl interface for P2P_DEVICE (p2p-dev-*)
1c42b42 P2P: Fix TDLS and l2_packet init without P2P Device interface
9e6a321 Fix non-P2P build after the P2P_DEVICE changes
d53d259 Fix build with older OpenSSL versions
54d4ba4 nl80211: Silence a compiler warning with older gcc versions
2e5ba4b P2P: Derive group interface name bit more sensibly
c68f620 P2P: Create P2P Device interface if supported
851b0c5 nl80211: Do not indicate P2P_DEVICE support by default
bb4028f P2P: Ignore p2p_no_group_iface when driver advertizes P2P_DEVICE support
7940c79 nl80211: Use wdev id when cancelling wait for frame using P2P_DEVICE
f608081 nl80211: Verify P2P GO/client address with all interface addresses
5fbcb45 nl80211: Fix determining phy name for P2P Device
27ce1d6 nl80211: Fix nl80211_get_wiphy_index() for P2P Device
080585c Add support for OCSP stapling to validate server certificate
72950ed P2P: Remove a call to wpas_p2p_deinit_global()
ab7a1ad nl80211: Fix P2P group interface creating using P2P Device
fa93de4 nl80211: Use wdev_id in nl80211_create_iface_once()
fdc554b nl80211: Use wdev id to obtain P2P Device scan results
597b94f nl80211: Add .get_mac_addr() callback for P2P Device
8e12685 nl80211: Rework setting interface mode
91724d6 nl80211: Introduce i802_set_iface_flags()
eb4582f nl80211: Remove P2P Device interface upon .deinit()
f632e48 nl80211: Fix P2P Device interface initialization
e472e1b nl80211: Handle creation of P2P Device interface
01517c8 nl80211: Allow Android P2P functionality
6bae92e nl80211: Add support for P2P Device in add interface
d6dcfcd nl80211: Add a handler to create_interface
d3aaef8 nl80211: Hold wdev identification for P2P Device
7aad838 nl80211: Identify if nl80211 is capable of P2P Device abstraction
6a71413 nl80211: Rename is_p2p_interface
8393e1a nl80211: Print interface name on set_key()
80ebfd9 VLAN: Avoid access to non-existing interfaces
4345fe9 bridge: Track inter-BSS usage
459eee9 bridge: Use safe default bridge interface
2aaeedf bridge: Give bridge name in per-bss configuration
8a901d7 D-Bus: Emit signal when a station is authorized or deauthorized
9578329 Add AVG_RSSI report in signal_poll
2cc8d8f Add bandwidth and center freq info to signal_poll
1e0e943 Remove 802.11b rates only in case of P2P group operation
2090a0b nl80211: Add prints for kernel events
8743676 TDLS: Validate ext_supp_rates in copy_supp_rates
85b4eac P2P: Do not reply to 802.11b-only Probe Request frames as GO
ec7b97a Interworking: Add support for using eap_proxy offload
4331263 Fix session timeout after ANQP dummy STA entry with SME-in-driver
56cb4e1 wpadebug: Add option to ignore SSL errors
aa20e1a Remove CONFIG_NO_WPA2 build parameter
5d5c4ee Remove compiler warnings with CONFIG_NO_SCAN_PROCESSING
9aaa695 Remove compiler warnings if TDLS is enabled without WPA2
84ae1d4 Fix WNM build without WPA2
c33d5eb Fix build without WPA2 or EAP
1aef400 IBSS RSN: Implement disconnect() callback using sta_deauth()

Change-Id: I4593be5b1478f6532da917423b1d2afa95fb8020
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/config_file.c
ostapd/defconfig
ostapd/eap_register.c
ostapd/hostapd.conf
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/authsrv.c
rc/ap/beacon.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.h
rc/ap/ieee802_11.c
rc/ap/ieee802_1x.c
rc/ap/vlan_init.c
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/wpa_common.c
rc/crypto/tls.h
rc/crypto/tls_openssl.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/eap_common/eap_defs.h
rc/eap_common/eap_eke_common.c
rc/eap_common/eap_eke_common.h
rc/eap_peer/eap_config.h
rc/eap_peer/eap_eke.c
rc/eap_peer/eap_methods.h
rc/eap_peer/eap_tls_common.c
rc/eap_server/eap.h
rc/eap_server/eap_i.h
rc/eap_server/eap_methods.h
rc/eap_server/eap_server.c
rc/eap_server/eap_server_eke.c
rc/eap_server/eap_server_gpsk.c
rc/eap_server/eap_server_ikev2.c
rc/eap_server/eap_server_mschapv2.c
rc/eap_server/eap_server_psk.c
rc/eap_server/eap_server_sake.c
rc/eapol_auth/eapol_auth_sm.c
rc/eapol_auth/eapol_auth_sm.h
rc/p2p/p2p.c
rc/radius/radius_server.c
rc/radius/radius_server.h
rc/rsn_supp/pmksa_cache.c
rc/rsn_supp/pmksa_cache.h
rc/rsn_supp/preauth.c
rc/rsn_supp/preauth.h
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_ie.c
rc/utils/build_config.h
rc/wps/wps_upnp.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/android.config
pa_supplicant/ap.c
pa_supplicant/config.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new.h
pa_supplicant/defconfig
pa_supplicant/driver_i.h
pa_supplicant/eap_register.c
pa_supplicant/events.c
pa_supplicant/ibss_rsn.c
pa_supplicant/interworking.c
pa_supplicant/main.c
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
e6cf61356701e87728df492dee978eb08c994ca0 27-Jun-2013 Kenny Root <kroot@google.com> am 65699d14: am 499d6840: Merge "Remove obsolete keystore path"

* commit '65699d14fab37ab374ce46c6192d4e9b56ec26c1':
Remove obsolete keystore path
65699d14fab37ab374ce46c6192d4e9b56ec26c1 27-Jun-2013 Kenny Root <kroot@google.com> am 499d6840: Merge "Remove obsolete keystore path"

* commit '499d68402f55bd1b8aa1a0d9c6966c7392704fba':
Remove obsolete keystore path
499d68402f55bd1b8aa1a0d9c6966c7392704fba 27-Jun-2013 Kenny Root <kroot@google.com> Merge "Remove obsolete keystore path"
7f401806ed4775e4230dc3265d2c70b61c7c7e4e 26-Jun-2013 Kenny Root <kroot@google.com> Remove obsolete keystore path

It's not possible to get a raw private key from keystore anymore, so
this would fail every time anyway. Remove it so it doesn't confuse
anyone that looks at this code.

Change-Id: I021fc1707b16474d8698c85055a6fcc4095cd215
rc/crypto/tls_openssl.c
8bae4138a0356709720a96f3e50b4d734e532c12 06-Jun-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 4abc0424ef4bde2ea4fb1ba1c18619c7bc36eb02

4abc042 P2P: Automatic channel selection at re-invocation of persistent GO
8f39528 P2P: Modify wait time in INVITE state based on Tx status of INV-REQ
e112764 nl80211: Use NL80211_ATTR_PEER_AID to set TDLS peer AID
f8a5fd4 Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
9b1693a WPS: Allow Device Password Id changes between PIN methods
1ba51ec nl80211: Add debug print for set_supp_port operation
add9b7a nl80211: Ignore deauth/disassoc event from old AP
eb4737f Fix ESS_DISASSOC ctrl_iface command parser
b54c9ff FT: Fix TKIP group key configuration in FT protocol
e78aaca Stop TKIP countermeasures on FLUSH command
3cb953e Do not set driver MAC ACL unless driver supports this
3c4ca36 hostapd: Support MAC address based access control list

Change-Id: I0250e483c2992e6da8b2d1a323b7e3b8a73f9608
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ctrl_iface.c
ostapd/main.c
rc/ap/ap_drv_ops.h
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/nl80211_copy.h
rc/p2p/p2p_invitation.c
rc/rsn_supp/wpa_ft.c
rc/wps/wps_enrollee.c
pa_supplicant/ctrl_iface.c
pa_supplicant/p2p_supplicant.c
d3e385e428c94340d89ba090e3500a085463e713 05-Jun-2013 Dmitry Shmidt <dimitrysh@google.com> Fix wpa_cli 'IFNAME=iface' prefix processing

Change-Id: I3117a1b74707193dcc0598a47285813d6d7c5567
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_cli.c
65af1b08cb0d429d446af520472e20c026cd67aa 23-May-2013 Dmitry Shmidt <dimitrysh@google.com> Remove 'interface=iface' command prefix

Change-Id: I01caeeff2cf356afb4ce0453d7a78f7ecfae1de6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/wpa_cli.c
f7e0a9905988e62e4f70fed8b795722abeab719b 23-May-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 376204934db44d45f798bdde4db005bc88d666f0

3762049 wpa_cli: Support tab completion with ifname= prefix
13b11ba wpa_cli: Allow IFNAME= prefix to be used
ae8535b WNM: Make ESS Disassoc Imminent event more convenient to use
6df634f WNM: Do not reject ESS Disassoc Imminent
7b53acd WNM: Use defines for BSS Trans Mgmt field values
8e1bc70 WNM: Fix ess_disassoc timeout to be specified in TBTTs
901d1fe WNM: Remove PMKSA cache entry on ESS disassoc imminent notification
dad153d Try to use fast-associate on ENABLE_NETWORK
b068001 Fix already-associated detection with driver-based BSS selection
72728c6 P2P: Relax channel forcing for invitation processing with MCC support
4033935 Fix OKC-based PMKSA cache entry clearing
1045ec3 nl80211: Add couple of additional iftypes to debug prints
2cadc8e TDLS: Retry TDLS Setup Response more quickly

Change-Id: Ib02db74ca336a4d2da66c21d361c5529ee85f864
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ctrl_iface.c
rc/ap/pmksa_cache_auth.c
rc/ap/pmksa_cache_auth.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/common/ieee802_11_defs.h
rc/common/wpa_ctrl.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.h
rc/p2p/p2p_invitation.c
rc/rsn_supp/pmksa_cache.c
rc/rsn_supp/pmksa_cache.h
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wnm_sta.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
b6e9aaf735990dc64cdb6efccc03d076768eabf3 20-May-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit d5b559b6418c2bd09663e0d09e93a6592357fdce

d5b559b WNM: Add disassociation timeout processing for ESS_DISASSOC
f65f539 GAS: Reduce query timeout to two seconds
7a56af5 GAS: Assign new dialog token even if previous one is free
9e1ecab GAS: Ignore replays if previous frag_id without dropping GAS session
fa7ae95 Add test code for fetching the last configured GTK
576bce9 P2P: Direct global ctrl_iface commands automatically for P2P
c4bf83a P2P: No duplicate AP-STA-CONNECTED/DISCONNECTED as global event
7793c95 Clean up AP-STA-CONNECTED/DISCONNECTED prints
92c4465 P2P: Mark P2P events global (not specific to interface)
ed496f1 P2P: Clean up debug prints
710ae9a P2P: Move p2p_find stopped event message into p2p_supplicant.c
47bfe49 Add wpa_msg_global() for global events
214e428 Allow global ctrl_iface monitors
89c7ac5 wpa_cli: Set buffer length the same as in wpa_supplicant_ctrl_iface_process()
faf9a85 Add band option (2.4 vs. 5) for filtering scans
b83b1b2 Android: Clarify keystore include directories
6f1127c Android: Add a top level Android.mk
d2a9e2c Abstract and Android sockets for global ctrl_iface
6fd5cea wpa_cli: Allow global interface to be used in interactive mode
2925756 wpa_supplicant: Add -G argument to specify global ctrl group
cf3bebf Allow global ctrl_iface to be used for per-interface commands
058c863 FT RRB: Fix a memory leak on error path

Change-Id: I32a4afb43894167a30c4b0df18fd4846a2945c7c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid.mk
ostapd/ctrl_iface.c
ostapd/hostapd_cli.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/wpa_auth_ft.c
rc/common/wpa_ctrl.c
rc/drivers/driver_test.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_dev_disc.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_group.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_pd.c
rc/p2p/p2p_sd.c
rc/utils/wpa_debug.c
rc/utils/wpa_debug.h
pa_supplicant/README
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_named_pipe.c
pa_supplicant/ctrl_iface_udp.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/gas_query.c
pa_supplicant/main.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
44c957860ca714a86357591f39aff0bfa904c743 17-May-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit c6ccf12d3f6f35e295f9522dded535da8af6ab98

c6ccf12 P2P: Use preferred channel list during GO creation
6d956c4 P2P: Re-select channel in invitation case with peer info
010b5f9 P2P: Fix p2p_pref_chan setting from configuration file
d7692b8 dbus: Terminate cleanly on messagebus shutdown
e2396a6 WNM: Enable CONFIG_WNM in Android.mk
65bcd0a WNM: Add sending of BSS Transition Management Query
e27d20b WNM: Add neighbor report processing for BSS Transition Management
f3e907a WPS: Clear connection failure counts on WPS success
170f566 NFC: Connect using learnt credential after NFC Tag read
0af2db7 edit: Fix libreadline history clearing with WPA_TRACE

Change-Id: I0599ea2179869ae8c250ff6b887bb16324fc02f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/ieee802_11_defs.h
rc/p2p/p2p.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_utils.c
rc/utils/edit_readline.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_common.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wnm_sta.c
pa_supplicant/wnm_sta.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
ea69e84a6f4455c59348485895d3d5e3af77a65b 13-May-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 455299fb40d79bcbeaedcfbc04d00ac8330bbbdd

455299f nl80211: Fix foreign address filtering for MLME frame events
e679f14 Mark interface disconnected on removal request
3636b89 Do not try auto connect mechanism in disconnected state
0cdb93f Do not add BSS to blacklist on local disconnection request
36b9883 Defer scan if connection is in progress on any of the shared interfaces
7c0e1e2 tls_openssl: Store TLS context per-connection
732118e Rename hostapd_parse_rates() to a more generic int list parser
b113a17 DFS: Add ieee80211h hostapd configuration parameter
695c703 nl80211: Add driver_ops for stopping AP beaconing
f90e9c1 nl80211: Add driver_ops for starting radar detection
fc96522 nl80211: Add channel flags for DFS state information
f295d0c nl80211: Add driver capability flag for radar detection
04be54f nl80211: Add driver events for radar detection
a7505b1 eloop: Allow to run event loop multiple times in a row
6124e85 wpa_supplicant: Allow vifs to scan only current channel
893a0a5 systemd: Fix systemd interface alias

Change-Id: I0a39a6868562cd458202285fed8986ac81a0cef2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.conf
rc/ap/ap_config.h
rc/crypto/tls_openssl.c
rc/drivers/driver.h
rc/drivers/driver_common.c
rc/drivers/driver_nl80211.c
rc/utils/eloop.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/events.c
pa_supplicant/scan.c
pa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
pa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
pa_supplicant/systemd/wpa_supplicant.service.arg.in
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
51b6ea882f234c14cd1fe1332a3840cf61fafcca 08-May-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 6ea1f4135b72199988393f34dd7f5ad8040b7a42

6ea1f41 Try to set WPA-None key after IBSS-joined event
66562e9 Use cached driver capabilities instead of new fetch for each operation
55293aa TDLS: Do not overwrite the reason code in the Tear Down Request
4aa8186 Add a configration parameter for sched_scan interval
03565bc Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
f11b72c TDLS: Move AID=1 workaround into driver_nl80211.c
7853369 TDLS: Pass peer's AID information to kernel
55a2df4 HS 2.0: Include HS 2.0 Indication element only for HS 2.0 association
ad0685e edit: Fix history processing on running old command
9be3714 wpa_cli: Fetch the current BSSID list when starting interactive mode
69aa334 wpa_cli: Add BSSID tab completion for set bssid_filter
2156587 wpa_cli: Replace set command help with completion routine
f1fb042 wpa_cli: Allow space in the set command value
f5ffc34 wpa_supplicant: Allow global scan frequencies configuration
abfc3ad Synchronize build config comments for wpa_supplicant
a01e10d Android: Enable WPS ER and NFC support in the build
11e5a49 WPS: Do not use void* in arithmetic
0f105f9 HS 2.0: Move Probe Request Indication IE addition to proper place
8543ed8 WPA: Print pairwise EAPOL-Key flag as a bool
7af092a hostapd: Add Key MIC in group EAPOL-Key frames corruption test option
b691dcb nl80211: Fix max_remain_on_chan capability reading
41b1a76 P2P: Clone beacon_int when initializing new group interface
741ed9f WPS: Remove duplicate networks after WPS

Change-Id: I9a2a0cb2acf87dfd7548318d2bda5f342b815884
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
leanSpec.mk
ostapd/config_file.c
ostapd/hostapd.conf
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_glue.c
rc/drivers/driver_nl80211.c
rc/drivers/nl80211_copy.h
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
rc/utils/edit.c
rc/wps/http_client.c
pa_supplicant/android.config
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/defconfig
pa_supplicant/events.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/hs20_supplicant.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
1cf4573e05a4e7ce02e0ccc46771a1da5f303411 30-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> P2P: Fix group removal in case of frequency conflict

Group removal in wpas_p2p_handle_frequency_conflicts() happens
during wpa_supplicant_associate() processing and in case of having
interface per group will cause interface removal and use of freed
memory later. So we need to postpone it to eloop timer.

Change-Id: Iee15b31a03a8c7f675929a2a51a6ad20d7070193
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
4b06059785b935dd1f4f09314e4e12c417d2c6a4 30-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit b57b560034f1bb1ad3a3892228940dde97323c0e

b57b560 wpa_supplicant: Default to nl80211 instead of wext
ee28f08 hostapd: Add more messages for error paths
61d2ce2 hostapd: Reject configuration file without interface parameter
a8a7890 Clear extra_blacklist_count on FLUSH command
c646862 WPS ER: Allow UPnP interface to be forced
728d971 Use status code 17 (unable to handle new STA) on max-STA limitation
5e24dc8 Add dup_binstr() to help common binary string tasks
8b44ad7 Use os_zalloc() instead of os_malloc() + os_memset()
2c48211 FT RRB: Validate os_malloc() return value before using it
7ca902b Make vlan_file optional if dynamic_vlan is used
bdb112d Add bitfield routines
04382f7 NFC: Add no waiting and no multiple operations options for scripts
fe90496 WPS: Fix AP auto configuration on config token generation
28fcfb6 NFC: Increase wpa_cli command buffer size
8f7a6dd WPS NFC: Allow Device Password ID override for selected registrar
aaecb69 WPS: Use generic MAC Address attribute builder
9ccd916 P2P: Clean up channel--frequency conversion functions
e864c0a Use a common frequency to channel conversion function
02db75b FT: Reset FT flag upon STA deauthentication
7800d45 P2P: Set P2P_DEV_PEER_WAITING_RESPONSE from TX status callback
d78d3c6 EAP peer: Add check before calling getSessionId method
dd57970 Disable network temporarily on repeated connection failures

Change-Id: If8078d5c1ff40ea806e844543cf6f2bf9d24b7ac
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.conf
ostapd/main.c
rc/ap/drv_callbacks.c
rc/ap/ieee802_11.c
rc/ap/ieee802_1x.c
rc/ap/vlan_init.c
rc/ap/wpa_auth_ft.c
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/drivers/driver_ndis.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_wext.c
rc/drivers/drivers.c
rc/eap_peer/eap.c
rc/eap_peer/eap_mschapv2.c
rc/eap_peer/tncc.c
rc/eap_server/eap_sim_db.c
rc/eap_server/tncs.c
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_pd.c
rc/p2p/p2p_sd.c
rc/p2p/p2p_utils.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_ft.c
rc/tls/x509v3.c
rc/utils/Makefile
rc/utils/bitfield.c
rc/utils/bitfield.h
rc/utils/common.c
rc/utils/common.h
rc/wps/wps_attr_build.c
rc/wps/wps_common.c
rc/wps/wps_dev_attr.c
rc/wps/wps_enrollee.c
rc/wps/wps_er.c
rc/wps/wps_er.h
rc/wps/wps_er_ssdp.c
rc/wps/wps_i.h
rc/wps/wps_registrar.c
rc/wps/wps_upnp.c
rc/wps/wps_upnp_ap.c
rc/wps/wps_upnp_i.h
rc/wps/wps_upnp_ssdp.c
rc/wps/wps_upnp_web.c
pa_supplicant/README
pa_supplicant/ap.c
pa_supplicant/config.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/examples/wps-nfc.py
pa_supplicant/interworking.c
pa_supplicant/main.c
pa_supplicant/sme.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_priv.c
pa_supplicant/wpa_supplicant.c
8da800a193fb6f8832218715f82a7b4e2d2ad338 24-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 97279d8d1ad40bd7d884af8e2fc26dff0163331a

97279d8 nl80211: Drop frame events that are for foreign address
cc2ada8 nl80211: Reduce debug on Probe Request frames
63a965c P2P: Fix after_scan_tx processing during ongoing operations
06b7f58 RSN: Update preauth scan results only based on new scan results
18e00b5 Move wpa_s freeing into wpa_supplicant_deinit_iface()
754632c dbus_new: Add EAP logon/logoff
c2aff6b hostapd: Add some testing options
adc96dc nl80211: Fix nla_nest_start conversion
0606052 wpa_supplicant: Add get_capability freq
c7a39ba Provide TLS alerts to CLI/UI over control interface
2a07a27 P2P: Increase GTK rekeying period to 24 hours
75fa7d1 TDLS: Fix key configuration with current mac80211
8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested

Change-Id: Ic4b568c341657d266b7759513230d4ef206d75b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Makefile
ostapd/config_file.c
ostapd/defconfig
ostapd/hostapd.conf
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/beacon.c
rc/ap/drv_callbacks.c
rc/ap/ieee802_11.c
rc/common/wpa_ctrl.h
rc/drivers/driver_nl80211.c
rc/eapol_supp/eapol_supp_sm.c
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/rsn_supp/tdls.c
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/events.c
pa_supplicant/notify.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
2a96702ab0ec3e15ac53558a051c393d66c1c51e 24-Apr-2013 Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> am 7d96eda0: am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."

* commit '7d96eda062fd58d2ab28311bd0c8ab9193da4080':
P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.
7d96eda062fd58d2ab28311bd0c8ab9193da4080 24-Apr-2013 Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."

* commit '77979736ea5fe4448d77937df56d84d263436034':
P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.
77979736ea5fe4448d77937df56d84d263436034 24-Apr-2013 Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."
50440f01fda6a0ffd5757225f4f886afec768516 24-Apr-2013 Jouni Malinen <j@w1.fi> am 5d1c8ad1: wpa_supplicant: fix memory leak in -I option handling

* commit '5d1c8ad11de48ba5e449e83e1e5dcd844e9c35d1':
wpa_supplicant: fix memory leak in -I option handling
d7fb3adf3c23cf6ea337ad5083c76fd80ae096c2 24-Apr-2013 Iliyan Malchev <malchev@google.com> am 97d98069: Revert "wpa_supplicant: fix -I option handling"

* commit '97d980693a6550ea7a66d85cf1f453b1246436b2':
Revert "wpa_supplicant: fix -I option handling"
87a386c97c8629bbf8d28af121c9e1972a3d4fc0 24-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> am b9551352: wpa_supplicant: fix -I option handling

* commit 'b9551352f7b1af5c6e3ab7c07827db56651f6935':
wpa_supplicant: fix -I option handling
ec60e408250a4aef30d67cbc01d7c78acc1cbb5f 24-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> am 64f47c5c: wpa_supplicant: Add option -I for additional config file

* commit '64f47c5c24428834677459e048420f86e3514c20':
wpa_supplicant: Add option -I for additional config file
5d1c8ad11de48ba5e449e83e1e5dcd844e9c35d1 23-Apr-2013 Jouni Malinen <j@w1.fi> wpa_supplicant: fix memory leak in -I option handling

Change-Id: I1b393d245d606882e7bb548135d1eab99a988a81
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/config.h
pa_supplicant/main.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
97d980693a6550ea7a66d85cf1f453b1246436b2 23-Apr-2013 Iliyan Malchev <malchev@google.com> Revert "wpa_supplicant: fix -I option handling"

This reverts commit b9551352f7b1af5c6e3ab7c07827db56651f6935

This CL was not necessary after all.

Change-Id: I27ec7981f0c8d1dad409f827e7bf7f001378ee07
pa_supplicant/config_file.c
b9551352f7b1af5c6e3ab7c07827db56651f6935 16-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: fix -I option handling

Change-Id: I2344262f53b5e06116d0f9b5ae5a66190792cdb7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
pa_supplicant/config_file.c
64f47c5c24428834677459e048420f86e3514c20 16-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Add option -I for additional config file

This option can be used only for global parameters that is not going
to be changed from settings.

Change-Id: I4f18aa0a8503cf8cc3a847ac9fcc15419291edf0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
rc/utils/os_unix.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_none.c
pa_supplicant/config_winreg.c
pa_supplicant/eapol_test.c
pa_supplicant/main.c
pa_supplicant/preauth_test.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
9e4e8acef07b7053e93024a621489286900b9ec7 16-Apr-2013 Deepthi Gowri <deepthi@codeaurora.org> P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.

Unblock the code under wpas_p2p_set_group_idle_timeout which was
blocked under ANDROID_P2P.The unblocked code is basically avoid
to set group idle timeout if the group is started.

Change-Id: I0bb134b014f932802da474ccdc20ceb1a086e87b
pa_supplicant/p2p_supplicant.c
288d7b9eab273b7d30d9ae72a2e858be28c075b7 10-Apr-2013 Ying Wang <wangying@google.com> am e93dd11e: Add liblog

* commit 'e93dd11e00aa3a511406648774f01db31304323a':
Add liblog
e93dd11e00aa3a511406648774f01db31304323a 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: I1d1b468ca828306669a5d6e0797204dec5117971
ostapd/Android.mk
pa_supplicant/Android.mk
3c3f0537f285c07148ac5a2a0ee46dd23fc3e241 05-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> am 07c8efbb: Revert 8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested

* commit '07c8efbbf7c11c96b15ce21425292ba7c07f35ab':
Revert 8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested
07c8efbbf7c11c96b15ce21425292ba7c07f35ab 05-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> Revert 8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested

Bug: 8554432

Change-Id: I1f22539fd3c61a115956eb2d3634d0e4604e0759
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
026a876099763a96cd88281de1555fde993da793 04-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> am 5bd30337: wpa_supplicant: Enable TDLS

* commit '5bd3033779d5e41840f1b8e240e5f7a8f54b429c':
wpa_supplicant: Enable TDLS
5bd3033779d5e41840f1b8e240e5f7a8f54b429c 04-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Enable TDLS

Change-Id: Ibff5b85d7114215a1ba3c53c952a1f8c3d9e97bc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/android.config
345ef4b6267c34a3c7dbcc1b4f63da923801dfc8 02-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> am 1e78e769: Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff

* commit '1e78e76961664775f58b139f8c6388cfa0485f3d':
Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff
1e78e76961664775f58b139f8c6388cfa0485f3d 02-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff

88c8bf3 WPS NFC: Allow configuration token to be built from network block
e205401 WPS ER: Allow Enrollee to be specified with MAC address
c44a19c WPS ER: Document additional NFC command for ER operations
59307b3 WPS ER: Allow AP to be specified with BSSID
49e160a WPS: Fix use of pre-configured DH keys with multiple operations
5c9d63d WPS: Be more careful with pre-configured DH parameters
cd61936 hostapd: Show more helpful message for -g and -G errors

Change-Id: I7bfd1fa30214c54f2536679411ccd11bb4dd896d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/main.c
rc/wps/wps.h
rc/wps/wps_attr_build.c
rc/wps/wps_er.c
pa_supplicant/README-WPS
pa_supplicant/ctrl_iface.c
pa_supplicant/examples/wps-nfc.py
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
94c4651aaa2162f92cb37d9f1818f6fc3a9e7495 02-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> am 444d567b: Accumulative patch from commit 17b8995cf5813d7c027cd7a6884700e791d72392

* commit '444d567b27731d8572ef37697dd12fd1c37c2f24':
Accumulative patch from commit 17b8995cf5813d7c027cd7a6884700e791d72392
444d567b27731d8572ef37697dd12fd1c37c2f24 01-Apr-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 17b8995cf5813d7c027cd7a6884700e791d72392

17b8995 Interworking: Try to use same BSS entry for storing GAS results
3db5439 Optimize Extended Capabilities element to be of minimal length
8cd6b7b hostapd/wpa_s: Use driver's extended capabilities
acb5464 Add ctrl_iface command FLUSH for clearing wpa_supplicant state
97236ce WPS: Skip rescanning after provisioning if AP was configured
4342326 Add ignore_old_scan_res configuration parameter
9599ccc WPS: Clear after_wps on new WPS connection
702621e WPS: Use latest updated BSS entry if multiple BSSID matches found
ab547b5 WPS: Add more helpful debug for invalid WPS_REG command parsing
a679c0f WPS: Allow hostapd process to control independent WPS interfaces
ccdff94 WPS AP: Add support for reconfiguration with in-memory config
8970bae nl80211: Use nla_nest_start/end instead of nla_put_nested
558d69e P2P: Omit P2P Group Info in case of no connected peers
65a32cd AP: Fix infinite loop in WPA state machine when out of random bytes
a5f61b2 Fix OLBC non-HT AP detection to check channel
69554d7 ap_list: Remove unused functions
08c99ca ap_list: Remove unused iteration list pointers
6b16917 ap_list: Remove unused fields
66f1f75 P2P: Fix provision discovery response handling in some cases
2f9b66d Extend ROAM command to handle multiple SSIDs per BSS

Change-Id: I46002b1d3bbf6e376c2ae09bcb2c824c54805bbd
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.conf
ostapd/main.c
rc/ap/ap_config.h
rc/ap/ap_list.c
rc/ap/ap_list.h
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/ieee802_11_shared.c
rc/ap/wpa_auth.c
rc/ap/wps_hostapd.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/eap_peer/eap_wsc.c
rc/p2p/p2p_group.c
rc/p2p/p2p_pd.c
pa_supplicant/ap.c
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
333977927404699a0e52d47306fc7f25c53ac45e 30-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> am 0ccb66ed: Accumulative patch from commit ce26864e79144cba12d5ff98632570593cc57b8a

* commit '0ccb66edb8d2a0a397320ace3ec2a03fb0d00d5f':
Accumulative patch from commit ce26864e79144cba12d5ff98632570593cc57b8a
0ccb66edb8d2a0a397320ace3ec2a03fb0d00d5f 30-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit ce26864e79144cba12d5ff98632570593cc57b8a

187f87f hostapd: Allow ctrl_iface group to be specified on command line
9f890c9 TDLS: Support both external and internal setup in disabling link
864fe3a TDLS: Fix TDLS Setup Request processing in existing-peer cases
1d43e28 TDLS: Fix TPK M2 processing in concurrent initiation case
ef8151a P2P: Write p2p_ignore_shared_freq to configuration file on updates
8047f70 P2P: Ignore Tx acknowledgment status for Invitation Response
18a2eaa Add ap_vendor_elements for wpa_supplicant AP/P2P GO mode
b084df8 Add vendor_elements into Beacon/Probe Response IE parameters
b92e08f nl80211: Add debug prints for set_ap parameters
c30a4ab nl80211: Fix mode settings with split wiphy dump

Change-Id: I859638e630b6ca32b64e09943fce4d96f779897b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ctrl_iface.c
ostapd/main.c
rc/ap/ap_drv_ops.c
rc/ap/hostapd.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p_invitation.c
rc/rsn_supp/tdls.c
pa_supplicant/ap.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/wpa_supplicant.conf
175f1e68172f1b92524478e739e9a880dca6d27d 18-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> am 37d4d6a4: Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0

* commit '37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90':
Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0
424ec8d73a937b4f54a9e416ab8fb19068fbf2b8 18-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> am 700a137a: Accumulative patch from commit 565110cd554801fa301c55010b3e9e14f43d7973

* commit '700a137ab366edc72e371da68ba187b4717ee660':
Accumulative patch from commit 565110cd554801fa301c55010b3e9e14f43d7973
37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90 18-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0

P2P: Stop P2P_PD_DURING_FIND wait on PD Response RX
P2P: Postpone P2P scan only if station mode scan is pending
Use special scan result processing steps only on requesting interface
P2P: Re-start P2P operation if station mode scanning is stopped
P2P: Use common function for re-starting P2P scan after station scan

Change-Id: I62bb738a912483647606de1a5bd5357346ebd8f9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_pd.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/wpa_supplicant.c
700a137ab366edc72e371da68ba187b4717ee660 15-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 565110cd554801fa301c55010b3e9e14f43d7973

nl80211: Include interface name in more debug prints
Convert WPS NFC python scripts from using wpactrl to wpaspy
wpa_supplicant: Fix lookup of cached PMKSA
Add capability flag for IBSS and add get_capability modes
hostapd: Fix client reassociation after disconnect due to ACK failure
Fix build with CONFIG_NO_CONFIG_BLOBS
Fix build without CONFIG_CTRL_IFACE or CONFIG_NO_STDOUT_DEBUG
libtommath: Avoid a compiler warning on unused variable
libtommath: Condition fast_s_mp_mul_digs() on LTM_FAST
P2P: Remove persistent group peer if it rejects invitation
P2P: Allow shared interface channel preference to be ignored
P2P: Fix shared frequency preference for concurrent operations
P2P: Use best-overall channel in p2p_reselect_channel()
P2P: Allow all channels for multi-channel concurrency (no negotiation)
TDLS: Disable link to existing peer with lower address
Fix compiler warning when CONFIG_IEEE80211R is not included
WPS NFC: Fix build without CONFIG_WPS_ER
FT: Add support for IEEE 802.11r with driver-based SME

Change-Id: I1d5ced870c33d5cb73ecc6f04e272a3cf50f344a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/wps-ap-nfc.py
rc/ap/sta_info.c
rc/common/ieee802_11_defs.h
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa_ft.c
rc/tls/libtommath.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_old.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/events.c
pa_supplicant/examples/wps-nfc.py
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
fe565aed06a761739bec0056305e2a59f8749a4f 12-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> am 2f023193: Accumulative patch from commit f46fc73a3f8d0eeb1b43d17769464884f467ac47

* commit '2f023193a0fd630eb82ce6381b80911ad5a3462f':
Accumulative patch from commit f46fc73a3f8d0eeb1b43d17769464884f467ac47
2f023193a0fd630eb82ce6381b80911ad5a3462f 12-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit f46fc73a3f8d0eeb1b43d17769464884f467ac47

P2P: Add a peer entry based on Association Request frame
P2P: Clear p2p_in_provisioning flag on group removal
Allow SME SA Query to be used by all drivers
Android: Sync makefile changes for HT/VHT overrides
wpa_supplicant: Support VHT capability overrides
wpa_supplicant: Parse int values in different bases and reject invalid
wpa_supplicant: Reschedule sched scan after network change
Remove unnecessary local variable
wpa_supplicant: Handle enabling of one or all networks equally
wpa_supplicant: Save prev_sched_ssid only if needed
wpa_supplicant: Do not allow too short sched scan
nl80211: Use helper function for phy_info_freqs()
nl80211: Split phy_info_band() into smaller helper functions
nl80211: Use helper function for phy_info_handler()
nl80211: Split wiphy_info_handler() into smaller helper functions
nl80211: Support splitting wiphy information in dumps
Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
SAE: Add forgotten commit element validation step for FFC groups
SAE: Move commit element validation steps into single location

Change-Id: I369b6493f03714f6cfb4ed4a8c10ee6e6e71c1f8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/sae.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/drivers/nl80211_copy.h
rc/p2p/p2p_group.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/android.config
pa_supplicant/config.c
pa_supplicant/config_ssid.h
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/defconfig
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
dfbf7c49c6829d7dd1a8c9595a28ec82198608dd 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 26a19b24: (-s ours) am 6292bd70: am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '26a19b244b797b825575f0851e16e2b2ad5dc174':
26a19b244b797b825575f0851e16e2b2ad5dc174 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 6292bd70: am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6292bd70d5ced108db6becc198eeb2a3a3113638':
6292bd70d5ced108db6becc198eeb2a3a3113638 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7bf0939e106c975ac897b5d701e116b6c86ab75a':
7bf0939e106c975ac897b5d701e116b6c86ab75a 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7298e5ab20b37767cab89e7bc5784eb99d46a749':
7298e5ab20b37767cab89e7bc5784eb99d46a749 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2f3c1638351db28f560acb819772a397d47d4192':
2f3c1638351db28f560acb819772a397d47d4192 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '89d125ecbdbbeba975bd8c5cf5055558ddf35a4a':
89d125ecbdbbeba975bd8c5cf5055558ddf35a4a 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> Reconcile with jb-mr1-release - do not merge
7a5e50a0554bee77a9da492ea3d86f46147f1671 05-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 77e4e85321a0a1255901914d5de916aba050f9e1

P2P: Mark peer authorized for persistent group invitation
P2P: Indicate frequency for upper layer invitation processing
Allow wpa_supplicant AP mode to configure Beacon interval
P2P: Use peer's channel list to limit GO freq on invitation
P2P: Allow P2P client to specify preferred group channel
P2P: Use shared function for setting up frequencies
P2P: Allow all channels in case of multi channel concurrency
hostapd: Make VHT IE struct more expressive

Change-Id: I6d86d98a10a1a699bb464c5b916ebf21f626558b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_11_vht.c
rc/common/ieee802_11_defs.h
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_utils.c
pa_supplicant/README-P2P
pa_supplicant/ap.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_supplicant.conf
8c65289885e84727226d81b3d32856f79c31ee5f 01-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 3a2a7c3da64563bfff7a0f46e3654f54a1eacbd1

P2P: Fix regression in GO Negotiation
P2P: Skip Listen phase when peer is expected to be waiting
P2P: Increase GO Negotiation timeouts

Change-Id: I77c8512067f49b46aea79d4bf394a0a24f4d0725
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
2f3b8dec59373945c5feef8a78ced8967a80cc66 01-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 9e4d304ed7e2516b92081a5fba7288715ebb

nl80211: Add debug print for cancel-frame-wait command
Avoid partial BSS entries in control interface
Mark last BSS entry by #### instead of ====
Add WPA_BSS_MASK_DELIM flag to BSS command
nl80211: Fix WDS STA handling with multiple BSS interfaces
Use scan results for reconnection
Interworking: Remove unused variable warnings
wpa_cli: Increase receive buffer from 2048 to 4096 bytes

Change-Id: I518e7e374a98cec542b673dd27348f5b469e5826
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/common/wpa_ctrl.h
rc/drivers/driver_nl80211.c
pa_supplicant/ctrl_iface.c
pa_supplicant/interworking.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
971384bf5a0aa9c19b10c02e4ae7e909147c6be9 01-Mar-2013 Nick Kralevich <nnk@google.com> am be6cd8f7: Merge "wpa_supplicant_8: use correct header file."

* commit 'be6cd8f75c858d95ae44d3b220557473e695317a':
wpa_supplicant_8: use correct header file.
be6cd8f75c858d95ae44d3b220557473e695317a 28-Feb-2013 Nick Kralevich <nnk@google.com> Merge "wpa_supplicant_8: use correct header file."
a562b19dfc52d80b60d485c5661f36d9d6b40911 28-Feb-2013 Nick Kralevich <nnk@google.com> wpa_supplicant_8: use correct header file.

Change-Id: I168ac70cc03d0dd31af77906d71b8b1f77752501
rc/utils/os_unix.c
9cdf1b905fae57dea42506a1af67f6ece544b261 27-Feb-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 8cee87ab139e52516ee4185789b40a0459fa7406

P2P: Only schedule a single p2p_go_neg_start timeout at a time
P2P: Do not start new GO Neg on Probe Req when waiting for Confirm
P2P: Fail GO Negotiation on missing Group ID
P2P: Assign GO tie breaker bit at the same time with dialog token

Change-Id: Ie7d1a795988cd5e8420234392e9a83a3ad4165f0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
33e38bfa7159cef089d6ee0d904778e184c72c47 27-Feb-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit f8361e3d681e55efead2aac79fedf4b232d533fb

TDLS: Pass peer's VHT Capability information during sta_add
WPS: Clear sent_carrier to avoid errors in python script
WPS: Fix OOB Device Password use in PSK1,PSK1 derivation
WPS: Add AP mode NFC connection handover with wpa_supplicant/nfcpy
WPS NFC: Add connection handover support for ER
WPS: Add wps-er-config command for writing config token from ER

Change-Id: I8934dcffb9f66bd3a2f840b78d72c9dd6cecf61d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/wps-ap-nfc.py
rc/ap/wps_hostapd.c
rc/eap_peer/eap_wsc.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
rc/wps/wps_registrar.c
pa_supplicant/ctrl_iface.c
pa_supplicant/examples/wps-nfc.py
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
33077b18208aab987e14cd26f0f501c7666a89ff 27-Feb-2013 Jouni Malinen <jouni@qca.qualcomm.com> P2P: Fix GO Probe Response IEs when Wi-Fi Display is enabled

Commit 1a9f6509b3a711071c12006ff7c3a9cb2a6691f2 added support for
fragmenting the P2P IE in Probe Response frames from a GO. However, it
did not take into account the possibility of Wi-Fi Display IE being
included in the same buffer and caused a regression for the cases where
Wi-Fi Display is enabled. Fix this by building the possibly fragmented
P2P IE first and then concatenating the separate IEs together.

Bug: 8225922
Change-Id: I3c11c4558506f2324f883bb555f025b535b9e40e
rc/p2p/p2p_group.c
f86232838cf712377867cb42417c1613ab5dc425 20-Feb-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit b618a469c42120e984ab1c85ed6058504d1fca78

Author: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Sat Feb 16 19:54:09 2013 +0200
Interworking: Select highest priority cred if multiple matches

Interworking: Select highest priority cred if multiple matches
GAS server: Fix a regression in GAS server callback
hostapd: Fix Max SP Length derivation from QoS Info
nl80211: Configure STA Capabilities and Extended Capabilities
Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
WPS: Fix build without CONFIG_WPS_NFC
WPS: Add support for NFC handover select generation with wpa_supplicant
WPS: Update NFC connection handover documentation
WPS: Add support for config token generation with wpa_supplicant
WPS: Allow password token to be written with nfcpy
WPS: Use pre-configured NFC password token instead of overriding it
TDLS: Pass peer's Capability and Ext Capability info during sta_add
TDLS: Pass peer's HT Capability and QOS information during sta_add
nl80211: Add debug prints for STA add/set operations
TDLS: Fix add/set STA operation
Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
WPS: Allow Device Password to be changed from M1 to M2
WPS: Fix wps_reg nfc-pw option
TDLS: Tear down peers when disconnecting from the AP
P2P: Do not use old scan result data for peer discovery
Use more accurate timestamps for scan results
P2P: Postpone P2P-DEVICE-FOUND if config_methods not known
P2P: Do not allow peer update to clear config_methods
WPS: Report NFC connection handover completion differently
P2P: Avoid concurrent scans during all steps of group formation
P2P: Cancel group formation timeout on group removal (on client)
WPS: Change listen time to match nfcpy default (250 ms)
WPS: Report only the carrier record from NFC to wpa_supplicant
WPS: Fetch only the carrier record from wpa_supplicant for NFC
WPS: Update nfcpy script to support AP mode NFC connection handover
WPS: Add command for fetching carrier record for NFC handover
WPS: Clean up debug prints with nfcpy
WPS: Remove 0.5 sec extra wait from NFC handover with nfcpy
WPS: Use alternating poll/listen for NFC peer discovery with nfcpy
WPS: Configure logging to show nfcpy log message
WPS: Add an example python script for NFC operations with hostapd
hostapd: Do not change HT40 capability due to OBSS scan
dbus: Add missing signal description for WPS (7)
EAP peer: Add Session-Id derivation to more EAP methods
EAP peer: Add Session-Id derivation
EAP-IKEV2 server: Fix invalid memory freeing operation
eap_proxy: Add a dummy implementation for compilation testing
eap_proxy: Add mechanism for allowing EAP methods to be offloaded
Android: Allow setgroups to be overridden from build configuration
P2P: Send p2p_stop_find event on failure to start pending p2p_find
P2P: Fix GO Probe Response IEs when Wi-Fi Display is enabled
Capability matching for 60 GHz band
nl80211: Add ctrl_iface message for AP mode connection rejection
P2P: Allow local configuration to use 5 GHz band 40 MHz channels
Fix BSS RANGE command for no exact id match cases

Change-Id: Iac9284bba31db40911aecc3adf2843c9b1576db1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/README-WPS
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/hostapd_cli.c
ostapd/wps-ap-nfc.py
rc/ap/ap_config.h
rc/ap/drv_callbacks.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11_ht.c
rc/ap/wps_hostapd.c
rc/ap/wps_hostapd.h
rc/common/ieee802_11_defs.h
rc/common/wpa_ctrl.h
rc/drivers/driver.h
rc/drivers/driver_common.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_test.c
rc/drivers/nl80211_copy.h
rc/eap_common/eap_gpsk_common.c
rc/eap_common/eap_gpsk_common.h
rc/eap_peer/eap.c
rc/eap_peer/eap.h
rc/eap_peer/eap_aka.c
rc/eap_peer/eap_fast.c
rc/eap_peer/eap_gpsk.c
rc/eap_peer/eap_i.h
rc/eap_peer/eap_ikev2.c
rc/eap_peer/eap_peap.c
rc/eap_peer/eap_proxy.h
rc/eap_peer/eap_proxy_dummy.c
rc/eap_peer/eap_psk.c
rc/eap_peer/eap_sake.c
rc/eap_peer/eap_sim.c
rc/eap_peer/eap_tls.c
rc/eap_peer/eap_tls_common.c
rc/eap_peer/eap_tls_common.h
rc/eap_peer/eap_ttls.c
rc/eap_peer/eap_wsc.c
rc/eap_server/ikev2.c
rc/eapol_supp/eapol_supp_sm.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_pd.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
rc/utils/os_unix.c
rc/wps/ndef.c
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_common.c
rc/wps/wps_enrollee.c
rc/wps/wps_i.h
rc/wps/wps_registrar.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README-WPS
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/eap_proxy_dummy.mk
pa_supplicant/events.c
pa_supplicant/examples/wps-nfc.py
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
1e1c48d2b342d4945d600ddb650bd2925822d1bb 15-Feb-2013 Dmitry Shmidt <dimitrysh@google.com> Update AP IE regardless WPA_DRIVER_FLAGS_BSS_SELECTION flag

Change-Id: Ia2b0aea81e250cfd989861ed37551ca8c41f7a66
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
4b9d52f502481b258fec743c03a5e957e5605afc 06-Feb-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit cc03d0fef3bf5913f8e11b7e998c10bf36a3c07f

Author: Amar Singhal <asinghal@qca.qualcomm.com>
Date: Wed Feb 6 00:31:34 2013 +0200
Add "BSS LAST ..." command

- Add "BSS LAST ..." command
- HS 2.0: Fix IE buffer length for extra scan IEs
- TDLS: Several fixes
- P2P: Fix P2P-GROUP-STARTED event for p2p_connect-join
- P2P: Fix Action frame processing if Interworking is enabled
- wpa_supplicant: Fix access to the freed memory when removing all networks
- Add driver for OpenBSD net80211 layer
- Make wpas_select_network_from_last_scan() static
- wpa_supplicant: Implement fast-associate on SelectNetwork
- Update scan interval gracefully
- eloop: Add a timer cancel that returns the remaining time
- nl80211: Do not use void pointer for driver_ops used internally
- hostapd: Fix crash when scan fails

Change-Id: I083747a0b1f7000730a9ab3ea80f3ee7e6247181
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/gas_serv.c
rc/ap/hostapd.h
rc/ap/ieee802_11.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_openbsd.c
rc/drivers/drivers.c
rc/drivers/drivers.mak
rc/drivers/drivers.mk
rc/rsn_supp/pmksa_cache.h
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.h
rc/utils/eloop.c
rc/utils/eloop.h
rc/utils/eloop_none.c
rc/utils/eloop_win.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/interworking.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
3a787e6f7c987ba5a9a56a2066467d20ab40ec58 17-Jan-2013 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Add 'SCAN TYPE=ONLY' functionality

Usual manual scan request may cause reassociation due to several reasons.
New command is intended to perform pure scan.

Change-Id: I5f517a9f50f286482290e76ca1088abf6a1aeff9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/wpa_cli.c
87219839a01e354c7e2539f6b5c787b67bc71da5 30-Jan-2013 Kenny Root <kroot@android.com> am 45fcd5c5: am f137c56d: Merge "Fix INCLUDES path for keystore headers."

# By Stephen Smalley
# Via Android Git Automerger (1) and others
* commit '45fcd5c547a5010a04871a463e54554f1cf693ef':
Fix INCLUDES path for keystore headers.
45fcd5c547a5010a04871a463e54554f1cf693ef 30-Jan-2013 Kenny Root <kroot@android.com> am f137c56d: Merge "Fix INCLUDES path for keystore headers."

# By Stephen Smalley
# Via Gerrit Code Review (1) and Stephen Smalley (1)
* commit 'f137c56d1c0820255d826a8ffa9b7d8c7cbcabed':
Fix INCLUDES path for keystore headers.
f137c56d1c0820255d826a8ffa9b7d8c7cbcabed 30-Jan-2013 Kenny Root <kroot@android.com> Merge "Fix INCLUDES path for keystore headers."
55bfa868b5555803151dcefe1f78922ad26b685e 28-Jan-2013 Jean-Baptiste Queru <jbq@google.com> am cd4bf967: am a18eec54: Merge "Fix regression in LEAP"

# By Jouni Malinen
# Via Android Git Automerger (1) and others
* commit 'cd4bf967a77b0bc5e84fd40a2cd418e2551f3f7a':
Fix regression in LEAP
cd4bf967a77b0bc5e84fd40a2cd418e2551f3f7a 28-Jan-2013 Jean-Baptiste Queru <jbq@google.com> am a18eec54: Merge "Fix regression in LEAP"

# By Jouni Malinen
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit 'a18eec546fdd7b48cee7a4fce5ba0f2ca6ad7889':
Fix regression in LEAP
a18eec546fdd7b48cee7a4fce5ba0f2ca6ad7889 28-Jan-2013 Jean-Baptiste Queru <jbq@google.com> Merge "Fix regression in LEAP"
259809be7696c9a8e0da53a79c83bb13c455395d 11-Oct-2012 Jouni Malinen <jouni@qca.qualcomm.com> Fix regression in LEAP

Commit 458cb3019108b6cb8c0c1cab94ae6ebf244eda27 broke LEAP since it
rejects EAP-Success packet that is used within LEAP and this frame does
not have a payload. Fix LEAP by relaxing the generic EAP packet
validation if LEAP has been negotiated.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/eap_peer/eap.c
a54fa5fb807eaeff45464139b5a7759f060cec68 15-Jan-2013 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit dc013f1e37df3462085cf01a13f0c432f146ad7a

Author: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Tue Jan 15 12:03:29 2013 +0200
eapol_test: Remove unnecessary header file inclusion

- P2P: Send P2P-FIND-STOPPED event in the new continue-search states
- P2P: Add some more details on Service Query TLV format
- P2P: Use the same Dialog Token value for every GO Negotiation retry
- P2P: Publish more connected clients info in Probe Response frames
- P2P: Fix some memory leaks in p2p_add_device()
- P2P: Use the same Dialog Token value for every PD retry
- P2P: Document operating channel selection functions
- P2P: Always re-select operating channel if not hard coded
- P2P: Do not allow re-selection of GO channel if forced_freq in use
- P2P: Set FORCE_FREQ flag as part of p2p_prepare_channel()
- P2P: Share a single function for GO channel selection
- P2P: Prefer operating channels where HT40 is possible
- P2P: Be more careful with wpa_config_update_psk() call
- P2P: Allow PSK to be used instead of passphrase for persistent GO
- P2P: Consider age for the P2P scan results
- Move some P2P offchannel operations to offchannel.c
- P2P: Add more complete description of p2p_cancel
- P2P: Allow p2p_cancel to be used to stop p2p_connect-join operation
- Interworking changes
- WNM changes
- WPS changes
- SAE changes

Change-Id: I38b847d3460066cc58aecbcf67266bfcff1d344e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/ChangeLog
ostapd/Makefile
ostapd/README
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/dump_state.c
ostapd/hostapd.conf
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/accounting.c
rc/ap/accounting.h
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/beacon.c
rc/ap/ctrl_iface_ap.c
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/hw_features.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11.h
rc/ap/ieee802_11_shared.c
rc/ap/ieee802_11_vht.c
rc/ap/ieee802_1x.c
rc/ap/pmksa_cache_auth.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/wnm_ap.c
rc/ap/wnm_ap.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_ft.c
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_i.h
rc/ap/wpa_auth_ie.c
rc/ap/wps_hostapd.c
rc/common/defs.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/common/sae.c
rc/common/sae.h
rc/common/version.h
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/crypto/crypto.h
rc/crypto/crypto_openssl.c
rc/crypto/dh_groups.c
rc/crypto/dh_groups.h
rc/crypto/sha256-prf.c
rc/crypto/sha256.h
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_test.c
rc/drivers/nl80211_copy.h
rc/eap_peer/eap.c
rc/eap_peer/eap_fast_pac.c
rc/eap_server/eap_server_aka.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_group.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_pd.c
rc/rsn_supp/peerkey.c
rc/rsn_supp/tdls.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/utils/common.h
rc/wps/wps_registrar.c
pa_supplicant/Android.mk
pa_supplicant/ChangeLog
pa_supplicant/Makefile
pa_supplicant/README
pa_supplicant/README-HS20
pa_supplicant/README-P2P
pa_supplicant/ap.c
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/ctrl_iface.c
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/gas_query.c
pa_supplicant/gas_query.h
pa_supplicant/interworking.c
pa_supplicant/offchannel.c
pa_supplicant/offchannel.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/sme.c
pa_supplicant/tests/test_wpa.c
pa_supplicant/wnm_sta.c
pa_supplicant/wnm_sta.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_gui-qt4/wpagui.cpp
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
d27fcf69aa1b0e5400526626b3ffdeacc21660b6 09-Jan-2013 Dmitry Shmidt <dimitrysh@google.com> Cleaning: Remove obsolte ANDROID_QCOM_WCN define

Change-Id: I4862776f2c4c7462519a7a431f7ef2dad389bfba
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
a05074ca1abe62b3fd8a8c30a5558e044b1356d5 21-Dec-2012 Jouni Malinen <jouni@qca.qualcomm.com> Extend EAPOL frames processing workaround for roaming cases

Commit 1ff733383f3d5c73233ef452a738765667021609 added a mechanism to
work around issues due to association events and EAPOL RX events being
getting reordered. However, this applied only for the case where
wpa_supplicant is not in associated state. The same issue can happen in
roaming case with drivers that perform BSS selection internally (or in
firmware). Handle that case similarly by delaying received EAPOL frame
processing if the source address of the EAPOL frame does not match the
current BSSID.

Since wired IEEE 802.1X do not have BSSID, make this additional
workaround conditional on BSSID match having been observed during the
previous association.

This fixes issues where the initial EAPOL frame after reassociation was
either dropped (e.g., due to replay counter not increasing) or replied
to with incorrect destination address (the BSSID of the old AP). This
can result in significantly more robust roaming behavior with drivers
that do not use wpa_supplicant for BSS selection.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/events.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
d5e4923d04122f81300fa68fb07d64ede28fd44d 04-Dec-2012 Dmitry Shmidt <dimitrysh@google.com> 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>
ostapd/Android.mk
ostapd/ChangeLog
ostapd/Makefile
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/defconfig
ostapd/hostapd.conf
ostapd/hostapd.eap_user_sqlite
ostapd/hostapd_cli.c
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/authsrv.c
rc/ap/ctrl_iface_ap.c
rc/ap/drv_callbacks.c
rc/ap/eap_user_db.c
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/ieee802_11.c
rc/ap/ieee802_11_auth.c
rc/ap/ieee802_11_auth.h
rc/ap/ieee802_11_vht.c
rc/ap/ieee802_1x.c
rc/ap/pmksa_cache_auth.c
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/tkip_countermeasures.c
rc/ap/tkip_countermeasures.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_ie.c
rc/ap/wps_hostapd.c
rc/ap/wps_hostapd.h
rc/common/defs.h
rc/common/ieee802_11_defs.h
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/crypto/md5-internal.c
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_bsd.c
rc/drivers/driver_ndis.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_privsep.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/netlink.c
rc/drivers/nl80211_copy.h
rc/eap_peer/eap.c
rc/eap_peer/eap_tls_common.c
rc/eap_server/eap_server_aka.c
rc/eap_server/eap_server_sim.c
rc/eap_server/eap_server_tls_common.c
rc/eapol_supp/eapol_supp_sm.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_build.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_pd.c
rc/radius/radius.c
rc/radius/radius.h
rc/rsn_supp/pmksa_cache.c
rc/rsn_supp/pmksa_cache.h
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/wps/ndef.c
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_attr_build.c
rc/wps/wps_attr_parse.c
rc/wps/wps_attr_parse.h
rc/wps/wps_attr_process.c
rc/wps/wps_common.c
rc/wps/wps_enrollee.c
rc/wps/wps_i.h
rc/wps/wps_nfc.c
rc/wps/wps_nfc_pn531.c
rc/wps/wps_registrar.c
rc/wps/wps_ufd.c
pa_supplicant/Android.mk
pa_supplicant/ChangeLog
pa_supplicant/Makefile
pa_supplicant/README-WPS
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/autoscan.c
pa_supplicant/bgscan_learn.c
pa_supplicant/blacklist.c
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new.h
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/dbus/dbus_new_handlers_wps.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/driver_i.h
pa_supplicant/events.c
pa_supplicant/examples/wps-nfc.py
pa_supplicant/gas_query.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/interworking.c
pa_supplicant/interworking.h
pa_supplicant/notify.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/preauth_test.c
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
pa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
pa_supplicant/systemd/wpa_supplicant.service.arg.in
pa_supplicant/systemd/wpa_supplicant.service.in
pa_supplicant/utils/log2pcap.py
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
90f44d5ff88189e0972bcd376b662d898e4c3c2e 07-Dec-2012 Mike J. Chen <mjchen@google.com> am 0fb73406: am 0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support

* commit '0fb734060951ad2513680f2d9f9013ff68c2772e':
Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
0fb734060951ad2513680f2d9f9013ff68c2772e 07-Dec-2012 Mike J. Chen <mjchen@google.com> am 0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support

* commit '0cc49e8db007f71888bf706420edfc530cf4fbff':
Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
0cc49e8db007f71888bf706420edfc530cf4fbff 05-Dec-2012 Mike J. Chen <mjchen@google.com> Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support

Change-Id: I5cfe2a1b66c0bb4fe5266e1bdd3fd929905ef520
Signed-off-by: Mike J. Chen <mjchen@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
70fd8a038c4b825f7585881cb26c68db516ad77a 23-Nov-2012 Jouni Malinen <jouni@qca.qualcomm.com> Android: Force group access to ctrl_iface directory

wpa_supplicant is started from /init.*.rc on Android and that seems
to be using umask 0077 which would leave the control interface
directory without group access. This breaks things since Wi-Fi
framework assumes that this directory can be accessed by other
applications in the wifi group. Fix this by adding group access even
if umask value would prevent this.

In most cases, this issue was not hit since the control interface
directory is normally created by that same init.*.rc file with suitable
mode and wpa_supplicant is killed in the way that does not allow it to
remove the file. However, if wpa_supplicant is allowed stop cleanly, it
will remove the directory and the next start could result with the Wi-Fi
framework not being able to use Wi-Fi (and GUI not showing Wi-Fi getting
enabled).

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/ctrl_iface_unix.c
84d2de985ec73d5c12bd03cc0b8bbb0d24be4689 21-Nov-2012 Ying Wang <wangying@google.com> resolved conflicts for merge of d3501922 to master

Change-Id: I1a934ce39a06fa30d3461b19cfe375400642ea4b
d35019220f1bbc0766a383d9502bcab956dec20c 21-Nov-2012 Ying Wang <wangying@google.com> Merge "Include the subdir Android.mks in fixed order."
b5ec21cf67a1caff165b2a45850a725d0f2865e1 21-Nov-2012 Ying Wang <wangying@google.com> Include the subdir Android.mks in fixed order.

The build fails when the include order is reversed.
On the other hand, the build system doesn't guarantee the file order
returned by all-subdir-makefiles.

Change-Id: I398e536fc8189d0f26ebc0b0342c778d234532ad

Conflicts:

Android.mk
ndroid.mk
62b90b3f61d96527800b43f3d467e32f06e1e8f1 21-Nov-2012 Ying Wang <wangying@google.com> Include the subdir Android.mks in fixed order.

The build fails when the include order is reversed.
On the other hand, the build system doesn't guarantee the file order
returned by all-subdir-makefiles.

Change-Id: I398e536fc8189d0f26ebc0b0342c778d234532ad
ndroid.mk
f1396b4ebf0d67866b9fba2655c3f9f3327fb0a2 16-Nov-2012 Stephen Smalley <sds@tycho.nsa.gov> Fix INCLUDES path for keystore headers.

Fix the following build error for master:
external/wpa_supplicant_8/hostapd/src/crypto/tls_openssl.c:49:35: fatal error: keystore/keystore_get.h: No such file or directory

Change-Id: I81c64677040287438e467f887c2f1c63a3239350
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ostapd/Android.mk
de922a387ae4e68dea3345b6ff68361302063731 15-Nov-2012 Kenny Root <kroot@google.com> am 56388dbb: Merge "Switch keystore to binder"

* commit '56388dbb276fef1e0ccdfcd5a38ab9b946bb3734':
Switch keystore to binder
56388dbb276fef1e0ccdfcd5a38ab9b946bb3734 14-Nov-2012 Kenny Root <kroot@google.com> Merge "Switch keystore to binder"
3f3ca3bb849b192d41b99aae775f6fc52f67118d 13-Nov-2012 Kenny Root <kroot@google.com> Switch keystore to binder

Change-Id: Idfcff5f2799863075160cc6c2565f2fe774c2552
rc/crypto/tls_openssl.c
pa_supplicant/Android.mk
3f2a11702f53c1bd867041b2320f6adc536aee9f 07-Nov-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Set Ver 0.8.X as default

Change-Id: I2d2433464068e863c12c0a06eed269e2a8c0fc46
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid.mk
a7d14de363019ce540e668357a9e8d2a11b08a49 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 600a7278: (-s ours) am c0aec062: am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '600a72784d7e928167ad0865d6ef2b2fd62a31db':
600a72784d7e928167ad0865d6ef2b2fd62a31db 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am c0aec062: am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'c0aec06214be674ced7106461e9f19c127fb1c70':
c0aec06214be674ced7106461e9f19c127fb1c70 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '930540de4415795500e22f02bb707768b7742fc6':
P2P: Fix network removal to select correct block
wpa_supplicant: Postpone P2P scan if usual scan is in progress
930540de4415795500e22f02bb707768b7742fc6 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibb893211cd723e60db60b80a3da19c58575461e2
b1cfada58a7a259e527e025b2b69806ef8121a57 01-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 19409cd0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '19409cd098ff01560443298f40652953222da067':
19409cd098ff01560443298f40652953222da067 01-Nov-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Id8e9b62ec7d117c1b6bdbeb739be7148f15f31cb
279731e733c27fd8dfb24d740c05f9ba1b4f8db0 01-Nov-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
85bade19e46fd326f1a4bf97424ef0ad697fbc81 31-Oct-2012 Irfan Sheriff <isheriff@google.com> am 5d7d6ace: am efb9743f: am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit '5d7d6ace05e310115d13fe31d68a218c7f20c18c':
Increase timeouts for p2p
5d7d6ace05e310115d13fe31d68a218c7f20c18c 31-Oct-2012 Irfan Sheriff <isheriff@google.com> am efb9743f: am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit 'efb9743f24044390273be6722656c2bf3ffddc7d':
Increase timeouts for p2p
efb9743f24044390273be6722656c2bf3ffddc7d 31-Oct-2012 Irfan Sheriff <isheriff@google.com> am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit '86c93df1d626c42147db2f2a6dfb5dcad83477ec':
Increase timeouts for p2p
86c93df1d626c42147db2f2a6dfb5dcad83477ec 31-Oct-2012 Irfan Sheriff <isheriff@google.com> Merge "Increase timeouts for p2p" into jb-mr1-dev
72681791764a6364216e2a4f35fbb5ec73900a24 31-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am af40b4e5: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'af40b4e5a4778313433ce9612c51ba367acf8d66':
af40b4e5a4778313433ce9612c51ba367acf8d66 31-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I99d44c2e57eba3b98e5d217591968559fa3d1fe3
1a2ce111ade9563d99ed7bb8156d6148ffd6c3a3 31-Oct-2012 Irfan Sheriff <isheriff@google.com> Increase timeouts for p2p

Dongles can be slow to respond and a quick turn around time on packets does not help.
Allow for upto 350ms on retry attempts for provision discovery, negotiation and invitation

This will catch slow responses within the first attempt and prevent any kind of issues
with sequence number handling

Bug: 7445415
Change-Id: I88a849d400b10f42ac298bad6d01f49803fcc8ba
rc/p2p/p2p.c
rc/p2p/p2p_invitation.c
16e2bf680e19e81b430356748e853a5989d21d45 30-Oct-2012 Sasha Levitskiy <sanek@google.com> am f368213f: am a27072d9: am b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API.

* commit 'f368213fa92b11482f0d5807dc149f405dd8e62f':
Add parameter checking and error reporting to wpa_blacklist API.
2f94df7ab8c628e45e81fec7bc8a68581d2cafc1 30-Oct-2012 Dmitry Shmidt <dimitrysh@google.com> am f210a2f4: am d73deeec: am 54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver

* commit 'f210a2f498f4854bb00528b9167c5f0d17c37f75':
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
31322d321437a18bb761b73964418cc83fd7a1df 30-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
f368213fa92b11482f0d5807dc149f405dd8e62f 30-Oct-2012 Sasha Levitskiy <sanek@google.com> am a27072d9: am b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API.

* commit 'a27072d9cc9ca8ee39cc4d8d645f6b0721ba5c8e':
Add parameter checking and error reporting to wpa_blacklist API.
a27072d9cc9ca8ee39cc4d8d645f6b0721ba5c8e 30-Oct-2012 Sasha Levitskiy <sanek@google.com> am b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API.

* commit 'b8fdecbfd0a0cdbbb17b902a6be87c84227b9b11':
Add parameter checking and error reporting to wpa_blacklist API.
b8fdecbfd0a0cdbbb17b902a6be87c84227b9b11 26-Oct-2012 Sasha Levitskiy <sanek@google.com> Add parameter checking and error reporting to wpa_blacklist API.

Bug: 7423119
Change-Id: Iae85361aa0dc94a75bffd07deef451c85e3d9d96
Signed-off-by: Sasha Levitskiy <sanek@google.com>
pa_supplicant/blacklist.c
f210a2f498f4854bb00528b9167c5f0d17c37f75 30-Oct-2012 Dmitry Shmidt <dimitrysh@google.com> am d73deeec: am 54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver

* commit 'd73deeecfe9764334b4d151d65d2989de65a9094':
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
d73deeecfe9764334b4d151d65d2989de65a9094 30-Oct-2012 Dmitry Shmidt <dimitrysh@google.com> am 54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver

* commit '54cb0f6fef5a8ffe2dc7ed98b274fe81ca84c431':
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
54cb0f6fef5a8ffe2dc7ed98b274fe81ca84c431 29-Oct-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Try to reject proper BSSID even if not set by the driver

Bug: 7423119

Change-Id: Id0266274c9c60f8eea872ca3cfa5ad40d9180789
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
1158d2799f6bcbac11d8875e125c679271d6e006 24-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
37f35369f5b99df6779cd4682448d97510f0bcff 23-Oct-2012 Jeff Johnson <jjohnson@qca.qualcomm.com> am dc4a9a1c: am 03df168d: am b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT

* commit 'dc4a9a1cc479eb06ca7610821aeb126fa1bfec31':
Add better handling of CTRL-EVENT-ASSOC-REJECT
dc4a9a1cc479eb06ca7610821aeb126fa1bfec31 23-Oct-2012 Jeff Johnson <jjohnson@qca.qualcomm.com> am 03df168d: am b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT

* commit '03df168d17437b6221a3f42876126974322f4e58':
Add better handling of CTRL-EVENT-ASSOC-REJECT
03df168d17437b6221a3f42876126974322f4e58 23-Oct-2012 Jeff Johnson <jjohnson@qca.qualcomm.com> am b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT

* commit 'b485b188f853a4ec5342c2ea49705b545b2caf3d':
Add better handling of CTRL-EVENT-ASSOC-REJECT
b485b188f853a4ec5342c2ea49705b545b2caf3d 22-Oct-2012 Jeff Johnson <jjohnson@qca.qualcomm.com> Add better handling of CTRL-EVENT-ASSOC-REJECT

In an enterprise environment a given Access Point (AP) may reject an
association request due to load balancing. In an enterprise with a
congested Wi-Fi network we may have to connect to many APs before we
find one that will accept the connection. Currently when the
wpa_supplicant receives a CTRL-EVENT-ASSOC-REJECT it will continue to
count down the 10 second authentication timer, and doesn't realize
that it should now attempt to find a different AP. Fix this issue in
multiple ways. First, we increase the number of association rejects
we handle before we disable the network. This will allow us more
opportunity to authenticate with other APs which are sharing the same
SSID. Second, when we are rejected we immediately blacklist the AP
and rescan so that we can immediately attempt to connect to other APs.

Bug: 7329568
Change-Id: I0ff66a0e05e6d4a9dec3dea98eccd850ecd5e343
pa_supplicant/events.c
ed9aceda1bcd8a6c4a209941adab3355452aca64 18-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
899b81ce6a86e3193bde8379ff3c2d79c7430b76 17-Oct-2012 Jeff Johnson <jjohnson@codeaurora.org> am c9330050: am a44422be: am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0

* commit 'c9330050e31b548cf2df57b77cdf2ceb7b0d70ec':
Support conc_pref when use_p2p_group_interface=0
c9330050e31b548cf2df57b77cdf2ceb7b0d70ec 17-Oct-2012 Jeff Johnson <jjohnson@codeaurora.org> am a44422be: am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0

* commit 'a44422be5306577189c7df272d3615129551b22e':
Support conc_pref when use_p2p_group_interface=0
a44422be5306577189c7df272d3615129551b22e 17-Oct-2012 Jeff Johnson <jjohnson@codeaurora.org> am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0

* commit '12b1cd9e151d1e5c4d35aa38531f38b4ef5cc805':
Support conc_pref when use_p2p_group_interface=0
12b1cd9e151d1e5c4d35aa38531f38b4ef5cc805 08-Oct-2012 Jeff Johnson <jjohnson@codeaurora.org> Support conc_pref when use_p2p_group_interface=0

The original implementation of wpas_p2p_handle_frequency_conflicts()
only works correctly when P2P groups use a separate interface
(i.e. use_p2p_group_interface=1). Update the implementation so
that it also works when the device interfaces is used
(i.e. use_p2p_group_interface=0).

Bug: 7290509
Change-Id: Icbc489125c5b7bd6e174d6aecd53555cdc9ad99d
pa_supplicant/p2p_supplicant.c
6e33bb907f6f03ccd43b26ee6c9fb065d771fd01 17-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
f5a0f76b8b8e3e1fbca2c57cceaa464df7f904ac 17-Oct-2012 Irfan Sheriff <isheriff@google.com> am 1449e2b6: am f1b71881: am 81931b8b: Increase channel delay to 100ms

* commit '1449e2b6a4b40abcd1fc7e5f5458bfbfec8c89a5':
Increase channel delay to 100ms
1449e2b6a4b40abcd1fc7e5f5458bfbfec8c89a5 17-Oct-2012 Irfan Sheriff <isheriff@google.com> am f1b71881: am 81931b8b: Increase channel delay to 100ms

* commit 'f1b7188187968e37abf9e4ac2e82c4ab08577d2a':
Increase channel delay to 100ms
f1b7188187968e37abf9e4ac2e82c4ab08577d2a 17-Oct-2012 Irfan Sheriff <isheriff@google.com> am 81931b8b: Increase channel delay to 100ms

* commit '81931b8bb302c38828763358f9e15af2b22c52c6':
Increase channel delay to 100ms
81931b8bb302c38828763358f9e15af2b22c52c6 17-Oct-2012 Irfan Sheriff <isheriff@google.com> Increase channel delay to 100ms

There is an inherent flaw in the p2p protocol design where an ACK loss right
before channel switch leads to peers being out of sync.

A work around of 50ms was added persistent case, but it turns out in heavy lossy
conditions that is not enough. Increase it to 100ms.

Experimental evaluation showed 100ms improves the reliability of p2p persistence
reinvocation.

Bug: 7359500
Change-Id: I73ab1b64e32b87101e95b0e487c90818c2c0aaf3
pa_supplicant/p2p_supplicant.c
6de35d839f3d5098c6b81ccc919b1f8737644b45 15-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-factory-release history after reset to jb-mr1-dev
be132adff11f8d9508378beaa054dd44b30b1881 15-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am d5d59275: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd5d5927584ce77872dfd070bb3c6558cf6fd441d':
d5d5927584ce77872dfd070bb3c6558cf6fd441d 15-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I1253d2b70d2ba5be1771d5824386c8c42bdbdf0f
ad78b33d9d002643fdb3f8e9d376a36d78212089 15-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
8319dc46b2c2efbc2d63baeb20a647ba99d79075 14-Oct-2012 Jouni Malinen <j@w1.fi> am 6c59bc14: am 532a21e6: am 2c5b17df: P2P: Improve robustness against lost ctrl::ack

* commit '6c59bc140981a064431fc8555d78de7d539d9b0c':
P2P: Improve robustness against lost ctrl::ack
6c59bc140981a064431fc8555d78de7d539d9b0c 14-Oct-2012 Jouni Malinen <j@w1.fi> am 532a21e6: am 2c5b17df: P2P: Improve robustness against lost ctrl::ack

* commit '532a21e653c99b23c904f21f9a31325eca450690':
P2P: Improve robustness against lost ctrl::ack
532a21e653c99b23c904f21f9a31325eca450690 14-Oct-2012 Jouni Malinen <j@w1.fi> am 2c5b17df: P2P: Improve robustness against lost ctrl::ack

* commit '2c5b17df4c29abdf11a85216c2f6272af796c576':
P2P: Improve robustness against lost ctrl::ack
2c5b17df4c29abdf11a85216c2f6272af796c576 14-Oct-2012 Jouni Malinen <j@w1.fi> P2P: Improve robustness against lost ctrl::ack

P2P includes two use cases where one of the devices is going to start a
group and likely change channels immediately after processing a frame.
This operation may be fast enough to make the device leave the current
channel before the peer has completed layer 2 retransmission of the
frame in case the ctrl::ack frame was lost. This can result in the peer
not getting TX status success notification.

For GO Negotiation Confirm frame, p2p_go_neg_conf_cb() has a workaround
that ignores the TX status failure and will continue with the group
formation with the assumption that the peer actually received the frame
even though we did not receive ctrl::ack. For Invitation Response frame
to re-invoke a persistent group, no such workaround is used in
p2p_invitation_resp_cb(). Consequently, TX status failure due to lost
ctrl::ack frame results in one of the peers not starting the group.

Increase the likelihood of layer 2 retransmission getting acknowledged
and ctrl::ack being received by waiting a short duration after having
processed the GO Negotiation Confirm and Invitation Response frames for
the re-invocation case. For the former, use 20 ms wait since this case
has been worked around in deployed devices. For the latter, use 50 ms
wait to get even higher likelihood of getting ctrl::ack through since
deployed devices (and the current wpa_supplicant implementation) do not
have a workaround to ignore TX status failure.

20 ms is long enough to include at least couple of retries and that
should increase likelihood of getting ctrl::ack through quite a bit. The
longer 50 ms wait is likely to include full set of layer 2 retries.

Bug: 7282991
Change-Id: If063895046ff42fb52579bfb386281085bedce58
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/p2p/p2p_go_neg.c
pa_supplicant/p2p_supplicant.c
4db32721644904e339e2a895a54f62ee4774e90f 09-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 65c8df85: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '65c8df8530418c66eedb06fa13372bcd41409492':
P2P: Fix network removal to select correct block
65c8df8530418c66eedb06fa13372bcd41409492 09-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ia76fbf94fed108207ae3cb4d53f710f81aa4311f
1cccfe8c0b59094a2564d268040478ecb278e790 05-Oct-2012 Jouni Malinen <j@w1.fi> P2P: Fix network removal to select correct block

If wpa_s->current_ssid is not set (e.g., after disconnection that
did not result in immediate group removal), an incorrect group could
have been removed since the network block iteration here could select
the network block that is used to store persistent group credentials.
Fix this by verifying that disabled != 2 to avoid picking the network
block that could not have been the temporary P2P group.

Bug: 7290511
Change-Id: Ia61bab3e11137ab2c0c34014e4d8d8bdee2a0469
pa_supplicant/p2p_supplicant.c
c374d0805b84d9e0f42aefda11fa57915149097c 05-Oct-2012 Jouni Malinen <j@w1.fi> am 7c5e12ad: am fe62849f: am 9d712833: P2P: Fix network removal to select correct block

* commit '7c5e12ada07c2f1334b29624adc97c7b6528db52':
P2P: Fix network removal to select correct block
7c5e12ada07c2f1334b29624adc97c7b6528db52 05-Oct-2012 Jouni Malinen <j@w1.fi> am fe62849f: am 9d712833: P2P: Fix network removal to select correct block

* commit 'fe62849f4448ef74add320a067a88bce61ed0f80':
P2P: Fix network removal to select correct block
fe62849f4448ef74add320a067a88bce61ed0f80 05-Oct-2012 Jouni Malinen <j@w1.fi> am 9d712833: P2P: Fix network removal to select correct block

* commit '9d71283328fbad680cc74d9b287580e373eb4d6c':
P2P: Fix network removal to select correct block
9d71283328fbad680cc74d9b287580e373eb4d6c 05-Oct-2012 Jouni Malinen <j@w1.fi> P2P: Fix network removal to select correct block

If wpa_s->current_ssid is not set (e.g., after disconnection that
did not result in immediate group removal), an incorrect group could
have been removed since the network block iteration here could select
the network block that is used to store persistent group credentials.
Fix this by verifying that disabled != 2 to avoid picking the network
block that could not have been the temporary P2P group.

Bug: 7290511
Change-Id: Ia61bab3e11137ab2c0c34014e4d8d8bdee2a0469
pa_supplicant/p2p_supplicant.c
c530787a27b308554cf24148b37b765181f639b6 04-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 86b5c679: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '86b5c67993dea522f6cc2549c93f63b0eae05379':
86b5c67993dea522f6cc2549c93f63b0eae05379 04-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I7faf49ef059f0f01586b3451426ee59d5778a25f
ba39653eb52ff6646dd7884817c60268ae076e6f 04-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d870b3dca941208eb6670d8b454ba6bc697ae593 04-Oct-2012 Jouni Malinen <j@w1.fi> am 235dc89e: am 436d1e84: am adddfc48: P2P: Fix p2p_cancel processing during group formation

* commit '235dc89ebadbb56719e6cec838a49c3aa07b2d1b':
P2P: Fix p2p_cancel processing during group formation
235dc89ebadbb56719e6cec838a49c3aa07b2d1b 04-Oct-2012 Jouni Malinen <j@w1.fi> am 436d1e84: am adddfc48: P2P: Fix p2p_cancel processing during group formation

* commit '436d1e842776ae15efe01f16f19a975177be5a88':
P2P: Fix p2p_cancel processing during group formation
436d1e842776ae15efe01f16f19a975177be5a88 04-Oct-2012 Jouni Malinen <j@w1.fi> am adddfc48: P2P: Fix p2p_cancel processing during group formation

* commit 'adddfc48d2d7bfa2b1a2405ab8f404b6383ec236':
P2P: Fix p2p_cancel processing during group formation
adddfc48d2d7bfa2b1a2405ab8f404b6383ec236 03-Oct-2012 Jouni Malinen <j@w1.fi> P2P: Fix p2p_cancel processing during group formation

The wpa_s->p2p_in_provisioning flag did not get cleared in some cases
where p2p_cancel command is used to stop group formation. This can result
in some operations (like p2p_find) failing afterwards. Fix this by using
wpas_group_formation_completed() when processing p2p_cancel for a group
that has not yet completed group formation.

Bug: 7280743
Change-Id: I2dea935bd7c0509237de54bd048954f75ce80bfc
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/p2p_supplicant.c
5a4f4732967c7d035eefff50092186f8d3ed05b4 04-Oct-2012 Jean-Baptiste Queru <jbq@google.com> am 4177ffd2: (-s ours) am 992b10f4: (-s ours) Reconcile with jb-dev - do not merge

* commit '4177ffd2ab90fb8b5d5d68b804ec1916fd656d8c':
4177ffd2ab90fb8b5d5d68b804ec1916fd656d8c 04-Oct-2012 Jean-Baptiste Queru <jbq@google.com> am 992b10f4: (-s ours) Reconcile with jb-dev - do not merge

* commit '992b10f49def736e424b9d6e01130de28b09cd1f':
992b10f49def736e424b9d6e01130de28b09cd1f 04-Oct-2012 Jean-Baptiste Queru <jbq@google.com> Reconcile with jb-dev - do not merge

Change-Id: Ie7428c559f53a12d88e9afdbd7234423881aed0f
c02806801e56ec670c09f31ff13ceb1bf0035c16 29-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am e2ca21cd: Merge from jb-mr1-aah-dev

* commit 'e2ca21cdc583071c19a4fe2dcb67f25dbdd32fe1':
e2ca21cdc583071c19a4fe2dcb67f25dbdd32fe1 28-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge from jb-mr1-aah-dev

Change-Id: I02876a27a1466842f648489ece651c356fe9d257
73f6ffd175bf59bb11eef9e73f546cf65b355b45 28-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 31dab599: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '31dab5994aac66e7e9bbe47ccaa399997d5b2d95':
31dab5994aac66e7e9bbe47ccaa399997d5b2d95 27-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I84f209a40227014231778a0b30a3d6a2c523e3e3
cf24ade7062c197d399634b41625629bdeaf5505 27-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
0f8afa4b79649f1b5c818910cfb854c21c04cb75 26-Sep-2012 Irfan Sheriff <isheriff@google.com> am d5393476: am 069fa2c3: Remove unnecessary channel list filtering

* commit 'd5393476007ae204387783a016e74aea5f1a147b':
Remove unnecessary channel list filtering
5fd5a9691b5e16704134ae034eeb20929957c76c 26-Sep-2012 Irfan Sheriff <isheriff@google.com> am 069fa2c3: Remove unnecessary channel list filtering

* commit '069fa2c39ec7120656a2ea8cca83c5ee41ddab60':
Remove unnecessary channel list filtering
d5393476007ae204387783a016e74aea5f1a147b 26-Sep-2012 Irfan Sheriff <isheriff@google.com> am 069fa2c3: Remove unnecessary channel list filtering

* commit '069fa2c39ec7120656a2ea8cca83c5ee41ddab60':
Remove unnecessary channel list filtering
7057d741714bb15d1316842e47718a2531bedac4 26-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am ff81427a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ff81427a2cd5ac877824101bec7ea50b8ad5bffb':
ff81427a2cd5ac877824101bec7ea50b8ad5bffb 26-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ice14c1907d8834bd141dc9d06ccb0d0e7f0f04d5
9662bcd6672ee8d3d4a52edb7cf89e89d1d1a046 26-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
069fa2c39ec7120656a2ea8cca83c5ee41ddab60 25-Sep-2012 Irfan Sheriff <isheriff@google.com> Remove unnecessary channel list filtering

Operating channel is always set even without an STA connected. Remove
channel list filtering based on that.

Channel list is filtered in the p2p_connect and p2p_invite path based
on force_freq which is essentially the operating channel for STA

This patch helps fix WifiDirect b/w two android devices for SCC while at
the same time keeping channel compliance with WFD dongle

Bug: 7232932
Change-Id: Ie9524f9e45b6f997959c3359a81b05f63b576045
rc/p2p/p2p.c
rc/p2p/p2p_build.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_invitation.c
f62edca733b5dcc52d00a396f6a208f5955c174f 26-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 82e047b1: am 91c40cdc: wpa_supplicant: P2P-related fixes

* commit '82e047b15c0e3a5935cef15fe6461633db5d3ab4':
wpa_supplicant: P2P-related fixes
82e047b15c0e3a5935cef15fe6461633db5d3ab4 25-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 91c40cdc: wpa_supplicant: P2P-related fixes

* commit '91c40cdce17424d9a4718876becf0b7811cf68f2':
wpa_supplicant: P2P-related fixes
2d52248068299f09312bc28122659eab2eb6ed5e 25-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 91c40cdc: wpa_supplicant: P2P-related fixes

* commit '91c40cdce17424d9a4718876becf0b7811cf68f2':
wpa_supplicant: P2P-related fixes
91c40cdce17424d9a4718876becf0b7811cf68f2 25-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: P2P-related fixes

- P2P: Show own channel list in debug log
- P2P: Allow peer to propose channel in invitation process
- P2P: Clear sta_scan_pending on group removal
- P2P: Fix ignoring of PD Response due to dialog token mismatch

BUG: 7226065, 7231289

Change-Id: Iacb0f85d80f63bcdf311ccc0d29d0c282a0c0576
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p_build.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_pd.c
pa_supplicant/p2p_supplicant.c
2b1bd2a9a203b03ce7ca41bda7316cdd2eac3fa6 25-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
8a2648dfb44731618b73b8fc75873c1a10d82c36 24-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 03b9cf83: am aa532510: wpa_supplicant: P2P-related fixes

* commit '03b9cf83dbc0225d79b35319391574ec382836dd':
wpa_supplicant: P2P-related fixes
1bc49db83d34753c3cf020802ac1d7ba13ca3960 24-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am aa532510: wpa_supplicant: P2P-related fixes

* commit 'aa532510a7b8c4da2d7d6e2c11dda5db840894e4':
wpa_supplicant: P2P-related fixes
03b9cf83dbc0225d79b35319391574ec382836dd 24-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am aa532510: wpa_supplicant: P2P-related fixes

* commit 'aa532510a7b8c4da2d7d6e2c11dda5db840894e4':
wpa_supplicant: P2P-related fixes
aa532510a7b8c4da2d7d6e2c11dda5db840894e4 24-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: P2P-related fixes

- Remove unused function warning in WPS-NFC case
- P2P: Fix p2p_ctrl_invite_persistent to parse peer parameter
- hostapd: Fix CONFIG_INTERWORKING=y build without CONFIG_HS20=y
- hostapd: Fix WDS VLAN bridge handling
- hostapd: Send EAPOL frames from the VO queue if WMM is active
- P2P: Remove channel 14 from supported P2P channels
- hostapd: Clear WLAN_STA_ASSOC_REQ_OK if sending the assoc response failed
- hostapd: Add check for the wds sta flag before creating 4addr VLANs
- nl80211: Use the monitor interface if socket tx status is not supported
- wpa_supplicant: Set state to DISCONNECTED on AP creation errors
- P2P: Fix p2p_group_idle in no-group-interface P2P client case
- P2P: Fix PSK configuration for GO network
- Print control interface commands in easier format
- Add debug print for no enabled networks case
- P2P: Add more debug prints for GO start routines
- P2P: Fix pending sta scan processing for concurrent operation cases

BUG: 6940646
Change-Id: I1b1c54a08c61ec4af2bfd2274afc93501004eea2

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/gas_serv.c
rc/ap/ieee802_11.c
rc/drivers/driver_nl80211.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wps_supplicant.c
5d790095eba79000f04216e5ab039f3040c2a162 24-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am e6ce5892: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e6ce589266deddd541fe728a13dc97d661a7c121':
e6ce589266deddd541fe728a13dc97d661a7c121 24-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Idb6548913ea9c4fc31a5b79e889274e7689f52c0
38b8d0e5610e034d10a6670a0ac41e0d9c0271d4 24-Sep-2012 Irfan Sheriff <isheriff@google.com> am a1b911d3: am f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes

* commit 'a1b911d3d65ef00058cc3ce04f1f6a26ec5552b7':
Fix build: Add ANDROID_P2P for SCC interop fixes
a854ce13cc4ed73fdf47bb3592b864538f152a56 24-Sep-2012 Irfan Sheriff <isheriff@google.com> am 3618cfa4: am af84a575: GC channel fixes for better interop with SCC

* commit '3618cfa44ec259d9adbae0905f980b313fa59f0b':
GC channel fixes for better interop with SCC
a1b911d3d65ef00058cc3ce04f1f6a26ec5552b7 24-Sep-2012 Irfan Sheriff <isheriff@google.com> am f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes

* commit 'f06196652a3e12af00503f4a548c56d4e60f7246':
Fix build: Add ANDROID_P2P for SCC interop fixes
3618cfa44ec259d9adbae0905f980b313fa59f0b 24-Sep-2012 Irfan Sheriff <isheriff@google.com> am af84a575: GC channel fixes for better interop with SCC

* commit 'af84a575044f6556994fcc124a955fc0ac0a6736':
GC channel fixes for better interop with SCC
d0c58c3b2c997cf2b639a9274ccfa65017e0b204 24-Sep-2012 Irfan Sheriff <isheriff@google.com> am f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes

* commit 'f06196652a3e12af00503f4a548c56d4e60f7246':
Fix build: Add ANDROID_P2P for SCC interop fixes
a9ebfe2fe7a0396a9756f33185e0c054a55dfbea 24-Sep-2012 Irfan Sheriff <isheriff@google.com> am af84a575: GC channel fixes for better interop with SCC

* commit 'af84a575044f6556994fcc124a955fc0ac0a6736':
GC channel fixes for better interop with SCC
86621986ec044db2c80f6d5a13c25d633c5993ba 24-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
f06196652a3e12af00503f4a548c56d4e60f7246 24-Sep-2012 Irfan Sheriff <isheriff@google.com> Fix build: Add ANDROID_P2P for SCC interop fixes

Change-Id: I847b63428b47016cf9a9a0b090636e1d5b9d28b8
rc/p2p/p2p_build.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_invitation.c
pa_supplicant/p2p_supplicant.c
60d855cce64e5b16c2f65e69132779ea04a3f15d 24-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
af84a575044f6556994fcc124a955fc0ac0a6736 23-Sep-2012 Irfan Sheriff <isheriff@google.com> GC channel fixes for better interop with SCC

- Force operating channel as the only channel in channel list attribute for go negotiation
and persistence
- Force an operating channel in go negotiation response even if the GO indicates a different
in negotiation request
- Fix a bug with updating peer operating channel based on GO negotiation confirm

Bug: 7217600
Change-Id: I6da0dc1a49c1d99ae97dcab8ee9899e07a80a6cb
rc/p2p/p2p_build.c
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_invitation.c
pa_supplicant/p2p_supplicant.c
2bc271b04f19c9c9a1bffcf0e843bae650d3b8bc 20-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 1389bc27: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1389bc2759c5639b39fe63b9c997009c6c8be9e2':
1389bc2759c5639b39fe63b9c997009c6c8be9e2 20-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I3295bdb670882ec455141c50d2c3f71dab97af67
bf1ed30dac4f7d63393b9d137d3edfd4957d5fe3 17-Sep-2012 Jouni Malinen <j@w1.fi> am daffc167: am 89ca702e: Do not inform other virtual interfaces of scan results in all cases

* commit 'daffc1677caf7d85c6d0a751b6da6b4e830fbd73':
Do not inform other virtual interfaces of scan results in all cases
d983a4309a63af560cafa61d1a416040cc497819 17-Sep-2012 Jouni Malinen <j@w1.fi> am b6dcd87a: am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan

* commit 'b6dcd87ac380d00848401633090a0a7f36e61e10':
P2P: Schedule new scan if P2P operation delays scan
eb0cf91e73e36ba62f2cbc74b7f0836d267a8c6f 17-Sep-2012 Jouni Malinen <j@w1.fi> am c9f2a642: am 043a5a9d: P2P: Check all interfaces for pending scan for p2p_scan failures

* commit 'c9f2a6428a18a942684d353914f62a8a12603b72':
P2P: Check all interfaces for pending scan for p2p_scan failures
d819635d612bec09ac829085bb62948fe53211d4 17-Sep-2012 Jouni Malinen <j@w1.fi> am a9df23eb: am dc7b7132: P2P: Move p2p_cb_on_scan_complete to global context

* commit 'a9df23eb15e3319448bb881c6e372fb260f85d37':
P2P: Move p2p_cb_on_scan_complete to global context
6102824ba4f72ec4b9fb8ff7de5ee0dabe628216 17-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am a53706f4: am 5887a9d5: wpa_supplicant: Skip unnecessary scan attempts

* commit 'a53706f4df02fe6634192db2ff63f9e875d2a567':
wpa_supplicant: Skip unnecessary scan attempts
b597a3fd0c29781e5eb42bca3893ab28a09d9686 17-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 9a29b324: am 9bce59c7: wpa_supplicant: Update to 10-Sep-2012 TOT

* commit '9a29b324277257c5afe48e92e81d4a7b99804475':
wpa_supplicant: Update to 10-Sep-2012 TOT
2b0014047a05f34301ab1f9640e93b546ccc1a51 16-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
49ff4f9d791555b7be3355a8a9f2f52137fbef38 14-Sep-2012 Jouni Malinen <j@w1.fi> am 89ca702e: Do not inform other virtual interfaces of scan results in all cases

* commit '89ca702e8ed3247d7007dbdebe531036671c34af':
Do not inform other virtual interfaces of scan results in all cases
daffc1677caf7d85c6d0a751b6da6b4e830fbd73 14-Sep-2012 Jouni Malinen <j@w1.fi> am 89ca702e: Do not inform other virtual interfaces of scan results in all cases

* commit '89ca702e8ed3247d7007dbdebe531036671c34af':
Do not inform other virtual interfaces of scan results in all cases
f9edc4227fe7a1f2450144c4d79ec9924be7f3da 14-Sep-2012 Jouni Malinen <j@w1.fi> am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan

* commit 'fa08f9eb31989e0973eb8ed0bd14c238be19ab0b':
P2P: Schedule new scan if P2P operation delays scan
0f9a57d4d1e5ace585d4efd905207b02ac16d088 14-Sep-2012 Jouni Malinen <j@w1.fi> am 043a5a9d: P2P: Check all interfaces for pending scan for p2p_scan failures

* commit '043a5a9d2586bf379a3f3e811c8c64d92050e131':
P2P: Check all interfaces for pending scan for p2p_scan failures
1efe18a38cbab84b3b7cdbe6a8e56c45c8b62e3b 14-Sep-2012 Jouni Malinen <j@w1.fi> am dc7b7132: P2P: Move p2p_cb_on_scan_complete to global context

* commit 'dc7b71324df9788e194745e8ab9386a4619a623a':
P2P: Move p2p_cb_on_scan_complete to global context
b6dcd87ac380d00848401633090a0a7f36e61e10 14-Sep-2012 Jouni Malinen <j@w1.fi> am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan

* commit 'fa08f9eb31989e0973eb8ed0bd14c238be19ab0b':
P2P: Schedule new scan if P2P operation delays scan
c9f2a6428a18a942684d353914f62a8a12603b72 14-Sep-2012 Jouni Malinen <j@w1.fi> am 043a5a9d: P2P: Check all interfaces for pending scan for p2p_scan failures

* commit '043a5a9d2586bf379a3f3e811c8c64d92050e131':
P2P: Check all interfaces for pending scan for p2p_scan failures
a9df23eb15e3319448bb881c6e372fb260f85d37 14-Sep-2012 Jouni Malinen <j@w1.fi> am dc7b7132: P2P: Move p2p_cb_on_scan_complete to global context

* commit 'dc7b71324df9788e194745e8ab9386a4619a623a':
P2P: Move p2p_cb_on_scan_complete to global context
c90b24ff6238b191ebc5bac24e99bc020c19780b 14-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
89ca702e8ed3247d7007dbdebe531036671c34af 14-Sep-2012 Jouni Malinen <j@w1.fi> Do not inform other virtual interfaces of scan results in all cases

If a connection operation is started on an interface based on scan
results, other virtual interfaces should not be information about the
results to avoid potential concurrent operations during the association
steps. Since the sibling notification of scan results received was added
as an optimization, skipping it for this type of cases is the simplest
way of avoiding unnecessary concurrent operations.

Change-Id: I145b4237074a97cc75fd68933fff7ed99b850630
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
pa_supplicant/interworking.c
fa08f9eb31989e0973eb8ed0bd14c238be19ab0b 14-Sep-2012 Jouni Malinen <j@w1.fi> P2P: Schedule new scan if P2P operation delays scan

This makes sure that the interrupted station mode scan can be completed
after the P2P operations have had their chance of using the radio.

Signed-hostap: Jouni Malinen <j@w1.fi>
pa_supplicant/events.c
043a5a9d2586bf379a3f3e811c8c64d92050e131 14-Sep-2012 Jouni Malinen <j@w1.fi> P2P: Check all interfaces for pending scan for p2p_scan failures

Driver could reject the new scan based on any virtual interface
running a concurrent scan. As such, mark the pending scan callback
for P2P based on any interfaces instead of just the one used for
the p2p_scan operation.

Signed-hostap: Jouni Malinen <j@w1.fi>
pa_supplicant/p2p_supplicant.c
dc7b71324df9788e194745e8ab9386a4619a623a 14-Sep-2012 Jouni Malinen <j@w1.fi> P2P: Move p2p_cb_on_scan_complete to global context

Since we have a global P2P module, the flag to trigger scan completion
events to it needs to be in similar context. The previous design
maintained this separately for each virtual interface and if P2P module
did not run its scan operation on the virtual interface that completed
the scan, P2P module would not be allowed to restart operations
properly.

Change-Id: I1b5a55c03aede15bbe0ac70dcbe0011a90f69b20
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
c7422651e3b5f68cd1c0d6bda43aed862ab3e1cf 14-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 5887a9d5: wpa_supplicant: Skip unnecessary scan attempts

* commit '5887a9d552f3d9d612011daba073e076daab5b2a':
wpa_supplicant: Skip unnecessary scan attempts
a53706f4df02fe6634192db2ff63f9e875d2a567 14-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 5887a9d5: wpa_supplicant: Skip unnecessary scan attempts

* commit '5887a9d552f3d9d612011daba073e076daab5b2a':
wpa_supplicant: Skip unnecessary scan attempts
5887a9d552f3d9d612011daba073e076daab5b2a 14-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Skip unnecessary scan attempts

Change-Id: Ieea8843c0fcb063dbb1df56e5cdf3fbdd0590cd4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
d0ac8d041597f0b8d66c4233fceae7230bc23ec6 14-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 9bce59c7: wpa_supplicant: Update to 10-Sep-2012 TOT

* commit '9bce59c7fef20e34a05f04d1e33a4076083dca0c':
wpa_supplicant: Update to 10-Sep-2012 TOT
9a29b324277257c5afe48e92e81d4a7b99804475 14-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 9bce59c7: wpa_supplicant: Update to 10-Sep-2012 TOT

* commit '9bce59c7fef20e34a05f04d1e33a4076083dca0c':
wpa_supplicant: Update to 10-Sep-2012 TOT
36c93fb9432ca8b6c3ae1cfa214dd2e78583885e 14-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
9bce59c7fef20e34a05f04d1e33a4076083dca0c 12-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to 10-Sep-2012 TOT

commit 762b99db7a76803d1ad274e87caa6fe870d47441
Author: Jouni Malinen <j@w1.fi>
Date: Mon Sep 10 12:33:29 2012 +0200

Fix last_scan_res update existing BSS entry is update

Change-Id: I03f933bf6d7f7e36b0f8ac410fbc37990f127c18
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/crypto/Makefile
rc/crypto/aes-ccm.c
rc/crypto/aes-gcm.c
rc/crypto/aes-internal-dec.c
rc/crypto/aes-internal-enc.c
rc/crypto/aes-internal.c
rc/crypto/aes_i.h
rc/crypto/aes_wrap.h
rc/crypto/crypto_internal-cipher.c
rc/tls/tlsv1_client.c
rc/tls/tlsv1_server.c
pa_supplicant/android.config
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/events.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
ee2330c5f6ed9ea4eb6cc01982cf69ab8fe0f12f 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 25438df4: am 2b380488: P2P: Skip join in case of provision discovery failure

* commit '25438df4b6e6f6f182193b841b1fbdf5c0712a16':
P2P: Skip join in case of provision discovery failure
f6b2dee91424b5a618e436cb2721c41ddd62f40a 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 687572c3: am 07f427a8: wpa_supplicant: Fix P2P command processing

* commit '687572c3bb65ac7676e25068e4c16f275507b614':
wpa_supplicant: Fix P2P command processing
812897df302bff367e2945875ade7cda02458102 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 2b380488: P2P: Skip join in case of provision discovery failure

* commit '2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5':
P2P: Skip join in case of provision discovery failure
37b4f363061ac28fa22eec8678361db57db544c5 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 07f427a8: wpa_supplicant: Fix P2P command processing

* commit '07f427a83c1bd048f8c4b6515d45f81e96877e37':
wpa_supplicant: Fix P2P command processing
25438df4b6e6f6f182193b841b1fbdf5c0712a16 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 2b380488: P2P: Skip join in case of provision discovery failure

* commit '2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5':
P2P: Skip join in case of provision discovery failure
687572c3bb65ac7676e25068e4c16f275507b614 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 07f427a8: wpa_supplicant: Fix P2P command processing

* commit '07f427a83c1bd048f8c4b6515d45f81e96877e37':
wpa_supplicant: Fix P2P command processing
2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> P2P: Skip join in case of provision discovery failure

Change-Id: I46cb3d2f17a45bf0ff62697040602334b818d805
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
07f427a83c1bd048f8c4b6515d45f81e96877e37 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Fix P2P command processing

Change-Id: Ib2e811513be7b05178e310040f7cae14cb425421
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
ecc9302652ad6a5027a525fe4cd42359352a5b7f 13-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am d12b7c7b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd12b7c7bb96b455ed1ef7752fa2b6ca567d60285':
wpa_supplicant: Postpone P2P scan if usual scan is in progress
e458a5712273fcc2b2dbb3387db7fccb3c348d86 13-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am f4f5db31: wpa_supplicant: Improve scan during p2p_find

* commit 'f4f5db315918f3f048324ea43dc37a3b0fb31ecc':
wpa_supplicant: Improve scan during p2p_find
8d095f9bb1cc2e5202d51b918491de2f2a000042 12-Sep-2012 Irfan Sheriff <isheriff@google.com> am 5a85f720: Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev

* commit '5a85f720c8e43866880fdf9446dc5ad9f45e9091':
clear wfd_dev_info_hex before use
d12b7c7bb96b455ed1ef7752fa2b6ca567d60285 12-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ib4e56e8c6a3ec814cff5eff35b9bdc80d3dcbc1d
9804cb103da4bb88c87cbb462167fe1054f8b9e7 12-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
1f2000f8919791f15c1bb2d371c35223d58cb359 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am f4f5db31: wpa_supplicant: Improve scan during p2p_find

* commit 'f4f5db315918f3f048324ea43dc37a3b0fb31ecc':
wpa_supplicant: Improve scan during p2p_find
f4f5db315918f3f048324ea43dc37a3b0fb31ecc 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Improve scan during p2p_find

Change-Id: I733b23c2b7a24cfa96fe6593adbcbeb7d0798002
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
d718f44b805823fe10523cca9b7187d74677782a 11-Sep-2012 Irfan Sheriff <isheriff@google.com> am 5a85f720: Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev

* commit '5a85f720c8e43866880fdf9446dc5ad9f45e9091':
clear wfd_dev_info_hex before use
5a85f720c8e43866880fdf9446dc5ad9f45e9091 11-Sep-2012 Irfan Sheriff <isheriff@google.com> Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev
8d96518810ad721dc2f07d3b08a186ce23db06ff 11-Sep-2012 Irfan Sheriff <isheriff@google.com> clear wfd_dev_info_hex before use

Change-Id: Ic5cdb4df220834faf9e7da5cc1cc0a4191e6abd1
pa_supplicant/p2p_supplicant.c
b674ee5de5dcdecc21e2716ce81564bd863f25db 11-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
79cad775dd779889782caef6946fe9d444e7dbc2 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Postpone P2P scan if usual scan is in progress

BUG: b/7137954

Change-Id: I64ef8dbb51c354b4cdebe490ffcd2cec07995939
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
7f3129ea5d5715d19fd9815ca268e8e18ae85720 11-Sep-2012 Iliyan Malchev <malchev@google.com> am 9bc61e18: Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"" into jb-mr1-dev

* commit '9bc61e18ee9adc8511c55c6b6a3eca3dfd193e62':
Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"
8554680d254b790b216d72242971b2bee7fba7b3 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am a2854abb: wpa_supplicant: Postpone P2P scan if usual scan is in progress

* commit 'a2854abb63b41c123e4c78e5653a55d902f00be6':
wpa_supplicant: Postpone P2P scan if usual scan is in progress
5ea3d091a806e0717e6c1b82ca6a2aa94413d731 11-Sep-2012 Iliyan Malchev <malchev@google.com> am 9bc61e18: Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"" into jb-mr1-dev

* commit '9bc61e18ee9adc8511c55c6b6a3eca3dfd193e62':
Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"
45bbe82bbcc08ebc2b019d3bf8ec40f2bc62d055 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 4530cfd4: wpa_supplicant: Update to 07-Sep-2012 TOT

* commit '4530cfd4d14a77c58e35393b91e40f8dd9d62697':
wpa_supplicant: Update to 07-Sep-2012 TOT
9bc61e18ee9adc8511c55c6b6a3eca3dfd193e62 11-Sep-2012 Iliyan Malchev <malchev@google.com> Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"" into jb-mr1-dev
05c12da79a892c71cfd8f50ad4fe6022a1eb2cd4 11-Sep-2012 Iliyan Malchev <malchev@google.com> Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"

This reverts commit 5d03c02c2828db5e40f92774dc78903d69677b20

Change-Id: I27492d70600007f6a1230b166e03c7a47ad63788
rc/ap/ap_config.c
620ade7603077b30d964ccd3232fdb04ce4234f7 11-Sep-2012 Irfan Sheriff <isheriff@google.com> am 8367dc90: Add WFD dev info in device found event

* commit '8367dc909f536f600c7474582fe0a96bef7c78fc':
Add WFD dev info in device found event
7912b459fc7d2b6fd2b24f45adf610f3a5c89403 11-Sep-2012 Arik Nemtsov <arik@wizery.com> am 2d266067: AP: Configure basic rates from iface and not conf

* commit '2d266067893660e2a4b5f166a909ee8638a5c96a':
AP: Configure basic rates from iface and not conf
9432e9282657828b66adaed9301bd110d65bbe2a 11-Sep-2012 Jouni Malinen <jouni@qca.qualcomm.com> am 5c44edb0: P2P: Do not fail p2p_group_remove just based on current_ssid

* commit '5c44edb00c9384534a1b50981071874436aaecd5':
P2P: Do not fail p2p_group_remove just based on current_ssid
ba734fcf064fac6da9170db35c363d7e5f5635a9 11-Sep-2012 Jouni Malinen <jouni@qca.qualcomm.com> am 31be0a4b: P2P: Allow p2p_invite-persistent to specify channel for GO

* commit '31be0a4b946ecab910c0a9af3837dbccea5d204b':
P2P: Allow p2p_invite-persistent to specify channel for GO
2a1eb2632bd8c813b15868564ba78a3eb00bbf44 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am dee117d0: Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev

* commit 'dee117d008719acfac082af3740349fc86629627':
SME: Fix disconnec-while-authenticating
944c60b5375e85627a72ab4e062422cac8542c66 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 37f5fa5a: Merge "Fix disconnection event processing" into jb-mr1-dev

* commit '37f5fa5a8706c16490dd841c280bc015f79d81da':
Fix disconnection event processing
7822c3764caad49c982317b8ba10d2430c361cbb 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 164eea3a: Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb-mr1-dev

* commit '164eea3ac2d53d1fecf20d76fd6b9f1920c17df4':
Fix REMOVE_NETWORK to not run operations with invalid current_ssid
4f4a204d21d78eeda294c7c54bcc838324c45a1d 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 8084af89: Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev

* commit '8084af89d283ed015e28a5eb781726ae5e138cf0':
nl80211: Register read_sta_data() handler for station only builds
88d3e94a1d3964b9f58317857754899d824375ed 11-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 66bf9c42: (-s ours) am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '66bf9c42970e42704a1618642662b9bc4997abfa':
Fix 'restore STA reconnection behavior' cherry-pick
Restore STA reconnection behavior
a5676d6b809437c90a8b95a2a90cfd00ef70345c 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am a2854abb: wpa_supplicant: Postpone P2P scan if usual scan is in progress

* commit 'a2854abb63b41c123e4c78e5653a55d902f00be6':
wpa_supplicant: Postpone P2P scan if usual scan is in progress
a2854abb63b41c123e4c78e5653a55d902f00be6 11-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Postpone P2P scan if usual scan is in progress

BUG: b/7137954

Change-Id: I64ef8dbb51c354b4cdebe490ffcd2cec07995939
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
998a62bbf6bd4aff6c7bc36200af6716b12f3aaf 10-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 4530cfd4: wpa_supplicant: Update to 07-Sep-2012 TOT

* commit '4530cfd4d14a77c58e35393b91e40f8dd9d62697':
wpa_supplicant: Update to 07-Sep-2012 TOT
4530cfd4d14a77c58e35393b91e40f8dd9d62697 10-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to 07-Sep-2012 TOT

commit 44256451130c4766e4a019162de17d0734444ee9
Author: Arik Nemtsov <arik@wizery.com>
Date: Fri Sep 7 00:22:40 2012 +0300

AP: Configure basic rates from iface and not conf

Skipped patches:
20ed5e40ba95440a1946cf2dffad3047fb620582
cf8baca6a5719f4f3257631e03317affee015417
a297201df15656dbb0f37e90f3410d9e8102c6fd
620c783753bddd37988269314862dc7e4a62f700

Change-Id: I857aa80af6d1a21b61f7c03a085e7dfc6066d61a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/hlr_auc_gw.c
ostapd/hlr_auc_gw.txt
ostapd/hostapd.conf
rc/ap/hw_features.c
rc/ap/wpa_auth.c
rc/ap/wpa_auth_ft.c
rc/ap/wpa_auth_ie.c
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/drivers/driver_atheros.c
rc/eap_peer/eap.c
rc/eap_peer/eap.h
rc/eap_peer/eap_aka.c
rc/eap_peer/eap_config.h
rc/eap_peer/eap_sim.c
rc/eap_server/eap_i.h
rc/eap_server/eap_server_aka.c
rc/eap_server/eap_server_sim.c
rc/eap_server/eap_sim_db.c
rc/eap_server/eap_sim_db.h
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p_invitation.c
rc/rsn_supp/peerkey.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa_ft.c
rc/rsn_supp/wpa_ie.c
pa_supplicant/Android.mk
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/ctrl_iface.c
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/hs20_supplicant.c
pa_supplicant/interworking.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
7ac67968339a0ac5d4a9697d53427284bbb13db7 10-Sep-2012 Irfan Sheriff <isheriff@google.com> am 8367dc90: Add WFD dev info in device found event

* commit '8367dc909f536f600c7474582fe0a96bef7c78fc':
Add WFD dev info in device found event
8367dc909f536f600c7474582fe0a96bef7c78fc 10-Sep-2012 Irfan Sheriff <isheriff@google.com> Add WFD dev info in device found event

Change-Id: If25804d41e7ea1d028a30c180290d8de547f43e8
pa_supplicant/p2p_supplicant.c
d908cf2a129ad29eec5eecf782e2e15c29be06fc 09-Sep-2012 Arik Nemtsov <arik@wizery.com> am 2d266067: AP: Configure basic rates from iface and not conf

* commit '2d266067893660e2a4b5f166a909ee8638a5c96a':
AP: Configure basic rates from iface and not conf
ec0e4972ab3ad3743081505d94e70071d086cdfe 09-Sep-2012 Jouni Malinen <jouni@qca.qualcomm.com> am 5c44edb0: P2P: Do not fail p2p_group_remove just based on current_ssid

* commit '5c44edb00c9384534a1b50981071874436aaecd5':
P2P: Do not fail p2p_group_remove just based on current_ssid
4d9f8ee27ea3ef3a443a7f4805f9d719d0a5df72 09-Sep-2012 Jouni Malinen <jouni@qca.qualcomm.com> am 31be0a4b: P2P: Allow p2p_invite-persistent to specify channel for GO

* commit '31be0a4b946ecab910c0a9af3837dbccea5d204b':
P2P: Allow p2p_invite-persistent to specify channel for GO
2d266067893660e2a4b5f166a909ee8638a5c96a 06-Sep-2012 Arik Nemtsov <arik@wizery.com> AP: Configure basic rates from iface and not conf

The conf doesn't contain any basic rates in some cases. Most notably,
when starting a P2P GO in 5 GHz. Use the iface rates which are
initialized in hostapd_prepare_rates() to the conf rates or set to
default values if no conf values exist. This fixes a bug introduced in
commit e5693c4775bae65faa960f80889f98b0a6cb2e1c.

Signed-hostap: Arik Nemtsov <arik@wizery.com>
rc/ap/beacon.c
5c44edb00c9384534a1b50981071874436aaecd5 31-Aug-2012 Jouni Malinen <jouni@qca.qualcomm.com> P2P: Do not fail p2p_group_remove just based on current_ssid

The wpa_s->current_ssid pointer may get cleared, e.g., when
disconnected. Commit 30ee769235f3170d9bf6b62c11c6e018e97deb84 made
wpas_p2p_group_delete() exit early before removing a P2P interface in
this type of case. That can cause number of issues from p2p_group_remove
command failing to busy loop when terminating wpa_supplicant if there is
a P2P group interface in client mode and that interface happens to be in
disconnected state. Fix these issues by allowing wpas_p2p_group_delete()
remove the P2P group interface regardless of whether wpa_s->currnt_ssid
is set.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/p2p_supplicant.c
31be0a4b946ecab910c0a9af3837dbccea5d204b 31-Aug-2012 Jouni Malinen <jouni@qca.qualcomm.com> P2P: Allow p2p_invite-persistent to specify channel for GO

The freq and ht40 parameters can now be used with the p2p_invite
command when reinvoking a persistent group as the GO.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/README-P2P
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/wpa_supplicant_i.h
568744f79c5fe71211c578e6a870e496367a91f0 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am dee117d0: Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev

* commit 'dee117d008719acfac082af3740349fc86629627':
SME: Fix disconnec-while-authenticating
2634f08051a3ece8c2917eb1d43463d2a8911ae9 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 37f5fa5a: Merge "Fix disconnection event processing" into jb-mr1-dev

* commit '37f5fa5a8706c16490dd841c280bc015f79d81da':
Fix disconnection event processing
dee117d008719acfac082af3740349fc86629627 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev
37f5fa5a8706c16490dd841c280bc015f79d81da 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "Fix disconnection event processing" into jb-mr1-dev
10fe97ce0213514d61133183ef5b72316eae5512 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 164eea3a: Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb-mr1-dev

* commit '164eea3ac2d53d1fecf20d76fd6b9f1920c17df4':
Fix REMOVE_NETWORK to not run operations with invalid current_ssid
d71f291a9f6ed6643e0510c5e2d368744b2e7638 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 8084af89: Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev

* commit '8084af89d283ed015e28a5eb781726ae5e138cf0':
nl80211: Register read_sta_data() handler for station only builds
164eea3ac2d53d1fecf20d76fd6b9f1920c17df4 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb-mr1-dev
8084af89d283ed015e28a5eb781726ae5e138cf0 09-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev
f8a26a8e6e081a2c576568198d0bcb4f976258ac 01-Sep-2012 Jouni Malinen <j@w1.fi> SME: Fix disconnec-while-authenticating

Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced
wpa_s->current_ssid to be cleared in wpa_supplicant_mark_disassoc()
which gets called from wpa_supplicant_event_disassoc(). This broke SME
disassoc-while-authenticating workaround for cfg80211. Fix this by
restoring wpa_s->current_ssid in case SME authentication is in progress.

Signed-hostap: Jouni Malinen <j@w1.fi>
pa_supplicant/events.c
2b89da85b8cfe9bb862e8dd334855263c3522c00 31-Aug-2012 Jouni Malinen <jouni@qca.qualcomm.com> Fix disconnection event processing

Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced
wpa_s->current_ssid and wpa_s->key_mgmt to be cleared in
wpa_supplicant_mark_disassoc() which gets called from
wpa_supplicant_event_disassoc(). This broke IEEE 802.1X authentication
failure processing and P2P deauthentication notification (group
termination).

Fix this by splitting wpa_supplicant_event_disassoc() into two parts and
make wpas_p2p_deauth_notif() indicate whether the interface was removed.
If so, the last part of disassocition event processing is skipped. Since
the wpa_supplicant_mark_disassoc() call is in the second part, the above
mentioned issues are resolved. In addition, this cleans up the P2P group
interface removal case by not trying to use fast reconnection mechanism
just before the interface gets removed.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
a831d78b5fb6af549533456cda57f88d73f6d153 03-Sep-2012 Deepthi Gowri <deepthi@codeaurora.org> Fix REMOVE_NETWORK to not run operations with invalid current_ssid

If the REMOVE_NETWORK command is used to delete the currently connected
network, some operations were run between removing the network and
clearing of wpa_s->current_ssid. This left wpa_s->current_ssid pointing
to freed memory and should any operation end up using it before the
pointer gets cleared, freed memory could be references. Avoid this by
removing the network only after having completed the operations that
clear wpa_s->current_ssid.

Signed-hostap: Deepthi Gowri <deepthi@codeaurora.org>
intended-for: hostap-1
pa_supplicant/ctrl_iface.c
1e6c57fee4a56b421cc20f6dc0785c9138b21337 05-Sep-2012 Jouni Malinen <j@w1.fi> nl80211: Register read_sta_data() handler for station only builds

This driver_op can now be used in station mode, too, to fetch
information about the connection with the AP, so allow this to be used
even if wpa_supplicant is built without AP mode support.

Change-Id: Ibef1d27ed0e2df312e715a88d500500c661860d1
Signed-hostap: Jouni Malinen <j@w1.fi>
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
f32e0483cc44095d89b4cbf52def50207d3059a2 08-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 66bf9c42: (-s ours) am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '66bf9c42970e42704a1618642662b9bc4997abfa':
Fix 'restore STA reconnection behavior' cherry-pick
Restore STA reconnection behavior
66bf9c42970e42704a1618642662b9bc4997abfa 08-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '26e08cb4a4ab9f9bc5446f4b831dec1828331cba':
Fix 'restore STA reconnection behavior' cherry-pick
Restore STA reconnection behavior
26e08cb4a4ab9f9bc5446f4b831dec1828331cba 08-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr0-release - do not merge

Change-Id: If17cb68d4590892767c5c9669b194c8c8cda68b6
15ebb378df0ec6475461e211833e39f20034ec64 07-Sep-2012 Irfan Sheriff <isheriff@google.com> am a7534b9c: Fix join for p2p_connect

* commit 'a7534b9cdb4f9c2b9ca56761119b0505626f03d6':
Fix join for p2p_connect
a7534b9cdb4f9c2b9ca56761119b0505626f03d6 07-Sep-2012 Irfan Sheriff <isheriff@google.com> Fix join for p2p_connect

wps_pbc with interface command stripped out ends up as a null character.
Supplicant tries to interpret that as a bssid. Fix it to ignore null
character as empty bssid

Change-Id: Ic91d6657efaf03fbe5c4a03e9e630b4b3ff5dec4
pa_supplicant/ctrl_iface.c
251ff48132477a4feada6fad4e016d73ea68f31c 06-Sep-2012 Jeff Johnson <jjohnson@codeaurora.org> am 205f2142: hostapd: Allow hostapd_cli to work on Android

* commit '205f2142134d2f3475fe1f893575df8f809eede4':
hostapd: Allow hostapd_cli to work on Android
e488da341f1264a7d5e053d7b16f9cc1f3c6af1e 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Fix 'restore STA reconnection behavior' cherry-pick

BUG: b/6400311

Change-Id: I7b90ab9b5430b92e9e4e5702c3b1805a6bbc0b9a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/config_ssid.h
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
6b24b49269d3adeb71f381b244a8417529d39047 18-Jun-2012 Irfan Sheriff <isheriff@google.com> Restore STA reconnection behavior

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: b/6674338, b/6910598, b/6400311
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

Conflicts:

wpa_supplicant/events.c
pa_supplicant/events.c
205f2142134d2f3475fe1f893575df8f809eede4 04-Sep-2012 Jeff Johnson <jjohnson@codeaurora.org> hostapd: Allow hostapd_cli to work on Android

Add definitions of the Android specific directories used for control
interface sockets so that hostapd_cli can connect to the Android
hostapd.

Change-Id: Iabcd8d70ef61fae6656066991240d55e65a032e4
ostapd/Android.mk
ostapd/hostapd_cli.c
a2f33d95c69c3cb84e2218910852f59d16a84693 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 61d9df3e: wpa_supplicant: Update to 29-Aug-2012 TOT

* commit '61d9df3e62aaa0e87ad05452fcb95142159a17b6':
wpa_supplicant: Update to 29-Aug-2012 TOT
2a15bd71a34bea9a5148a422dca1b48071da756b 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 4b86ea55: wpa_supplicant: Update to BRCM version 0.8.0-38

* commit '4b86ea55603eded752b5773179884a35e74e1a89':
wpa_supplicant: Update to BRCM version 0.8.0-38
1568cb6b0dcf727fe0930b5592ff307031596637 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 286cca54: Fix am cef482f8: merge

* commit '286cca548b36080e8bddef5dd4a8e4b17e78881c':
Fix am cef482f8: merge
61d9df3e62aaa0e87ad05452fcb95142159a17b6 30-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to 29-Aug-2012 TOT

commit 6ffdc2f7bd496ace7a46e055f9714e7db4b1f722
Author: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Fri Mar 2 22:31:04 2012 +0200

WFD: Add preliminary WSD request processing and response

This commit does not yet address support for different device roles,
i.e., the same set of subelements are returned regardless of which
role was indicated in the request.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

Change-Id: I9d63acce719b982c02e589bb59602382e82988c8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
ostapd/Makefile
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/ctrl_iface.h
ostapd/defconfig
ostapd/eap_register.c
ostapd/hlr_auc_gw.c
ostapd/hlr_auc_gw.txt
ostapd/hostapd.conf
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/accounting.c
rc/ap/accounting.h
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/ap/ap_drv_ops.c
rc/ap/ap_drv_ops.h
rc/ap/ap_list.c
rc/ap/beacon.c
rc/ap/drv_callbacks.c
rc/ap/gas_serv.c
rc/ap/gas_serv.h
rc/ap/hostapd.c
rc/ap/hostapd.h
rc/ap/hs20.c
rc/ap/hs20.h
rc/ap/hw_features.c
rc/ap/ieee802_11.c
rc/ap/ieee802_11.h
rc/ap/ieee802_11_auth.c
rc/ap/ieee802_11_auth.h
rc/ap/ieee802_11_vht.c
rc/ap/ieee802_1x.c
rc/ap/ieee802_1x.h
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/utils.c
rc/ap/vlan_init.c
rc/ap/vlan_util.c
rc/ap/vlan_util.h
rc/ap/wnm_ap.c
rc/ap/wnm_ap.h
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_ft.c
rc/ap/wpa_auth_glue.c
rc/ap/wpa_auth_i.h
rc/ap/wpa_auth_ie.c
rc/ap/wps_hostapd.c
rc/common/defs.h
rc/common/eapol_common.h
rc/common/gas.c
rc/common/gas.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/common/wpa_ctrl.c
rc/common/wpa_ctrl.h
rc/crypto/Makefile
rc/crypto/crypto.h
rc/crypto/crypto_openssl.c
rc/crypto/fips_prf_openssl.c
rc/crypto/md5-non-fips.c
rc/crypto/md5.h
rc/crypto/ms_funcs.c
rc/crypto/random.c
rc/crypto/sha1-pbkdf2.c
rc/crypto/sha1-prf.c
rc/crypto/sha1-tlsprf.c
rc/crypto/sha1.c
rc/crypto/sha1.h
rc/crypto/sha256-prf.c
rc/crypto/sha256.c
rc/crypto/sha256.h
rc/crypto/tls.h
rc/crypto/tls_openssl.c
rc/drivers/android_drv.h
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_bsd.c
rc/drivers/driver_common.c
rc/drivers/driver_ndis.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_privsep.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/driver_wext.h
rc/drivers/drivers.mak
rc/drivers/drivers.mk
rc/drivers/linux_ioctl.c
rc/drivers/nl80211_copy.h
rc/eap_common/eap_common.c
rc/eap_common/eap_common.h
rc/eap_common/eap_defs.h
rc/eap_peer/eap.c
rc/eap_peer/eap.h
rc/eap_peer/eap_config.h
rc/eap_peer/eap_fast.c
rc/eap_peer/eap_i.h
rc/eap_peer/eap_md5.c
rc/eap_peer/eap_methods.h
rc/eap_peer/eap_mschapv2.c
rc/eap_peer/eap_peap.c
rc/eap_peer/eap_tls.c
rc/eap_peer/eap_tls_common.c
rc/eap_peer/eap_tls_common.h
rc/eap_peer/eap_ttls.c
rc/eap_peer/eap_vendor_test.c
rc/eap_peer/mschapv2.c
rc/eap_server/eap_methods.h
rc/eap_server/eap_server.c
rc/eap_server/eap_server_md5.c
rc/eap_server/eap_server_tls.c
rc/eap_server/eap_server_tls_common.c
rc/eap_server/eap_server_tnc.c
rc/eap_server/eap_server_ttls.c
rc/eap_server/eap_server_vendor_test.c
rc/eap_server/eap_sim_db.c
rc/eap_server/eap_tls_common.h
rc/eapol_auth/eapol_auth_sm.c
rc/eapol_auth/eapol_auth_sm.h
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_go_neg.c
rc/p2p/p2p_group.c
rc/p2p/p2p_i.h
rc/p2p/p2p_invitation.c
rc/p2p/p2p_parse.c
rc/p2p/p2p_pd.c
rc/p2p/p2p_sd.c
rc/radius/radius.c
rc/radius/radius.h
rc/radius/radius_client.c
rc/radius/radius_das.c
rc/radius/radius_server.c
rc/rsn_supp/peerkey.c
rc/rsn_supp/pmksa_cache.c
rc/rsn_supp/wpa.c
rc/rsn_supp/wpa.h
rc/rsn_supp/wpa_ft.c
rc/rsn_supp/wpa_ie.c
rc/utils/common.c
rc/utils/common.h
rc/utils/edit.c
rc/utils/edit.h
rc/utils/edit_readline.c
rc/utils/edit_simple.c
rc/utils/eloop.c
rc/utils/eloop_win.c
rc/utils/ext_password.c
rc/utils/ext_password.h
rc/utils/ext_password_i.h
rc/utils/ext_password_test.c
rc/utils/os.h
rc/utils/wpabuf.c
rc/utils/wpabuf.h
rc/wps/wps.c
rc/wps/wps_enrollee.c
rc/wps/wps_registrar.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README-HS20
pa_supplicant/README-P2P
pa_supplicant/android.config
pa_supplicant/ap.c
pa_supplicant/bgscan_learn.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_udp.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_dict_helpers.c
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_new_handlers.h
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/defconfig
pa_supplicant/driver_i.h
pa_supplicant/eap_register.c
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/examples/p2p/p2p_connect.py
pa_supplicant/examples/p2p/p2p_disconnect.py
pa_supplicant/examples/p2p/p2p_find.py
pa_supplicant/examples/p2p/p2p_flush.py
pa_supplicant/examples/p2p/p2p_group_add.py
pa_supplicant/examples/p2p/p2p_invite.py
pa_supplicant/examples/p2p/p2p_listen.py
pa_supplicant/examples/p2p/p2p_stop_find.py
pa_supplicant/gas_query.c
pa_supplicant/interworking.c
pa_supplicant/interworking.h
pa_supplicant/main.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/scan.c
pa_supplicant/sme.c
pa_supplicant/tests/test_eap_sim_common.c
pa_supplicant/wifi_display.c
pa_supplicant/wifi_display.h
pa_supplicant/wnm_sta.c
pa_supplicant/wnm_sta.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_passphrase.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
4b86ea55603eded752b5773179884a35e74e1a89 04-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to BRCM version 0.8.0-38

- Restore p2p_group_formation pointer till the 4-way handshake
completes for the p2p client

Change-Id: I976659ae5dac4cf01ecdd7995ff9abb6bf914bc1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/p2p_supplicant.c
286cca548b36080e8bddef5dd4a8e4b17e78881c 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Fix am cef482f8: merge

Change-Id: I47a4610b40092d81a4d62e53a26924c4f9d05a17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/config_ssid.h
ad2102406085a6e0195d077ce9a0216cfc2c2067 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 1c1426e0: am cef482f8: am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick

* commit '1c1426e0af4c7d688bc5f8e269ec4a46782c8fa8':
Fix 'restore STA reconnection behavior' cherry-pick
1c1426e0af4c7d688bc5f8e269ec4a46782c8fa8 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am cef482f8: am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick

* commit 'cef482f830a787f249e7719ffb7d45db19ba1feb':
Fix 'restore STA reconnection behavior' cherry-pick
cef482f830a787f249e7719ffb7d45db19ba1feb 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick

* commit '0531f20404b2e284d1b444d5af48b6e0c629975b':
Fix 'restore STA reconnection behavior' cherry-pick
0531f20404b2e284d1b444d5af48b6e0c629975b 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Fix 'restore STA reconnection behavior' cherry-pick

BUG: b/6400311

Change-Id: I7b90ab9b5430b92e9e4e5702c3b1805a6bbc0b9a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/config_ssid.h
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
82cc05640cfb99ed363f8ee3e8dfe617c99c7c4e 05-Sep-2012 Irfan Sheriff <isheriff@google.com> am 59d1b471: am c5c02f1d: (-s ours) am a831bff7: Restore STA reconnection behavior

* commit '59d1b4715764a72184298e1c907ba2b3be5bb5a3':
Restore STA reconnection behavior
59d1b4715764a72184298e1c907ba2b3be5bb5a3 05-Sep-2012 Irfan Sheriff <isheriff@google.com> am c5c02f1d: (-s ours) am a831bff7: Restore STA reconnection behavior

* commit 'c5c02f1d8a39ff95f2a01e1cee7daf3c0ade6dbe':
Restore STA reconnection behavior
c5c02f1d8a39ff95f2a01e1cee7daf3c0ade6dbe 05-Sep-2012 Irfan Sheriff <isheriff@google.com> am a831bff7: Restore STA reconnection behavior

* commit 'a831bff72fa9e58cc9f71717f63c7649002e64fb':
Restore STA reconnection behavior
a831bff72fa9e58cc9f71717f63c7649002e64fb 18-Jun-2012 Irfan Sheriff <isheriff@google.com> Restore STA reconnection behavior

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: b/6674338, b/6910598, b/6400311
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

Conflicts:

wpa_supplicant/events.c
pa_supplicant/events.c
c994f38563ac82076a0751db1a61519950254d75 28-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> am 89e1d076: Debug-print command only in case of interface prefix

* commit '89e1d076d3c209d5a6b5eb3e43c41d9176058ff4':
Debug-print command only in case of interface prefix
89e1d076d3c209d5a6b5eb3e43c41d9176058ff4 28-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> Debug-print command only in case of interface prefix

Change-Id: If0054e8f7f4ffb2d559207d8939235938ae19f18
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface_unix.c
3f5180684f0adb62addfc52aabaeb60720cce104 27-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> am ad266fb3: wpa_supplicant: Update to BRCM version 0.8.0-37

* commit 'ad266fb3da6083126e7619e525153839b918aa44':
wpa_supplicant: Update to BRCM version 0.8.0-37
e1b4e84d15cebbebc26ccd4a1e19e74aa320e5d7 27-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> am f48e4f90: wpa_supplicant: Add bss_flush command to invalidate scan results

* commit 'f48e4f901d4b39a4e03210fe0154cdb11112e22e':
wpa_supplicant: Add bss_flush command to invalidate scan results
ad266fb3da6083126e7619e525153839b918aa44 25-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to BRCM version 0.8.0-37

- Allow AP_SME support
- Do not send disassoc after EAP failure since AP_SME is enabled
and del_station will be called
- Allow group idle timeout to run during WPS disconnect

Change-Id: I7e9e15b9c44804196bc98c01d51a71e24412b91d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_1x.c
rc/drivers/driver_nl80211.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/p2p_supplicant.c
f48e4f901d4b39a4e03210fe0154cdb11112e22e 24-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Add bss_flush command to invalidate scan results

Change-Id: I1a6ebc4fe53e16909ac44e2d04a6b651993dae91
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
pa_supplicant/wpa_cli.c
698db9f6c57a957c7c7744474921591c76619c21 23-Aug-2012 Jeff Johnson <jjohnson@codeaurora.org> am 5d03c02c: wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn

* commit '5d03c02c2828db5e40f92774dc78903d69677b20':
wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn
5d03c02c2828db5e40f92774dc78903d69677b20 14-Aug-2012 Jeff Johnson <jjohnson@codeaurora.org> wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn

The Qualcomm qcwcn driver relies upon information from the supplicant
to enable 802.11n and 802.11d support. Unfortunately there currently
does not exist configuration file parameters to control these items,
therefore hard code these in the supplicant.

Change-Id: Iaa586c58d96bd8966b47f6e18b627648df89c03e
rc/ap/ap_config.c
942781570eaa69366e12858941cec8c407cc7a9f 22-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> am d68f133b: Merge "wpa_supplicant: Fix wpa_drv_pktcnt_poll() call" into jb-mr1-dev

* commit 'd68f133bb71bf1e9e59a75464a7d05831566ab32':
wpa_supplicant: Fix wpa_drv_pktcnt_poll() call
d68f133bb71bf1e9e59a75464a7d05831566ab32 22-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "wpa_supplicant: Fix wpa_drv_pktcnt_poll() call" into jb-mr1-dev
0328fcc6e4736aaad055e6df22a03e856ef1c14b 22-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Fix wpa_drv_pktcnt_poll() call

Change-Id: I265b095235890be623090272a81e67123ff86185
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/driver_i.h
7c340e42ef2e9dc65f77ad79beb95f99efd92252 20-Aug-2012 Jeff Johnson <jjohnson@codeaurora.org> am e6c982c2: Add support for Qualcomm qcwcn Wireless Connectivity solution

* commit 'e6c982c258910f658901df7ecae2cc7a36eeea96':
Add support for Qualcomm qcwcn Wireless Connectivity solution
e6c982c258910f658901df7ecae2cc7a36eeea96 14-Aug-2012 Jeff Johnson <jjohnson@codeaurora.org> Add support for Qualcomm qcwcn Wireless Connectivity solution

Update the wpa_supplicant and hostapd makefiles to enable
ANDROID_P2P and ANDROID_QCOM_WCN conditional compilation
when the BOARD_WLAN_DEVICE is qcwcn.

Change-Id: I5d8216bdede6d6eb6613a83cda2c67c5eb7c2280
ostapd/Android.mk
pa_supplicant/Android.mk
eff1a9b29b685949090e894c45c11d8142cfe286 18-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> am 04abaa93: wpa_supplicant: Update to BRCM version 0.8.0-36

* commit '04abaa93653bcee36d59576c90f283d4efdb0a64':
wpa_supplicant: Update to BRCM version 0.8.0-36
04abaa93653bcee36d59576c90f283d4efdb0a64 18-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to BRCM version 0.8.0-36

Change-Id: Ic3f1375953f4a7c77d2208f8436d951889093397
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p.h
pa_supplicant/p2p_supplicant.c
0d50fd51810901e7555c6e48797273bf661e774c 17-Aug-2012 Joe Onorato <joeo@google.com> am 6fd24dba: am 978afbdb: am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '6fd24dba6b4d80569e64b9efb75624b9c458d9a5':
Get rid of LOCAL_MODULE_TAGS := user
6fd24dba6b4d80569e64b9efb75624b9c458d9a5 17-Aug-2012 Joe Onorato <joeo@google.com> am 978afbdb: am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '978afbdbf1e4b5e950f419ad5c24d08cd7df1f6d':
Get rid of LOCAL_MODULE_TAGS := user
978afbdbf1e4b5e950f419ad5c24d08cd7df1f6d 17-Aug-2012 Joe Onorato <joeo@google.com> am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '6f0634d6c8d1b07cc281db15c1a63ec348ebada0':
Get rid of LOCAL_MODULE_TAGS := user
6f0634d6c8d1b07cc281db15c1a63ec348ebada0 17-Aug-2012 Joe Onorato <joeo@google.com> Merge "Get rid of LOCAL_MODULE_TAGS := user"
f232310cc4b33614d4bd0837c0a2895d9719b4f3 22-May-2012 Joe Onorato <joeo@google.com> Get rid of LOCAL_MODULE_TAGS := user

Change-Id: I6d9ed4e6e1d94cfedcb703eec4adfe227d35b473
pa_supplicant/Android.mk
f956c5d78afc9979948b68047acfb4f2fa6dec09 13-Aug-2012 Irfan Sheriff <isheriff@google.com> am e557633a: Merge "Add delimiter for bss command" into jb-mr1-dev

* commit 'e557633aa9aae78f04f3ec135496027339408bb5':
Add delimiter for bss command
e557633aa9aae78f04f3ec135496027339408bb5 13-Aug-2012 Irfan Sheriff <isheriff@google.com> Merge "Add delimiter for bss command" into jb-mr1-dev
e2ea008a74fb04cee45dee9451812ff147502a5a 13-Aug-2012 Irfan Sheriff <isheriff@google.com> Add delimiter for bss command

With the availability of MASK option, the number of lines per BSS is not obvious,
add a delimiter to make parsing less flaky

Bug: 2961159
Change-Id: I9e5523f8da183e0735dbc06f0c09c9f841060504
pa_supplicant/ctrl_iface.c
db3713afd782259d71fb724079cbc7ddf59fbe34 10-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> am 762a3e30: nl80211: Clean nl80211_send_frame_cmd() function

* commit '762a3e300e5d8c28a693f7892eda7b3341064864':
nl80211: Clean nl80211_send_frame_cmd() function
762a3e300e5d8c28a693f7892eda7b3341064864 10-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> nl80211: Clean nl80211_send_frame_cmd() function

Change-Id: I1753151ac1a7b6f7cf48112185342faea44e8327
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
6453e5f67315e44ec397f41531e732a6a8e0963e 10-Aug-2012 Jouni Malinen <j@w1.fi> am 80da0428: Minor cleaning to be closer to mainstream

* commit '80da0428ce21beb670d31bd06d025d8609d658b4':
Minor cleaning to be closer to mainstream
80da0428ce21beb670d31bd06d025d8609d658b4 10-Aug-2012 Jouni Malinen <j@w1.fi> Minor cleaning to be closer to mainstream

Change-Id: I4aed30c59c549c2ce7488f12df4e68c6154f0ffe
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
OPYING
EADME
rc/drivers/driver_nl80211.c
rc/drivers/driver_wext.c
pa_supplicant/config.h
pa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
pa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
95b24c6e194d111cf2fe571a667121aca908a257 08-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> am b5e8f06e: wpa_supplicant: Update to BRCM version 0.8.0-34

* commit 'b5e8f06e18446918f6d801566e5709a8c87f1780':
wpa_supplicant: Update to BRCM version 0.8.0-34
86ae10737039eea0a83da0715908609bebde8064 08-Aug-2012 Irfan Sheriff <isheriff@google.com> am 2fb835aa: Restore STA reconnection behavior

* commit '2fb835aa12088072a839be109acf0f11153857f8':
Restore STA reconnection behavior
b5e8f06e18446918f6d801566e5709a8c87f1780 08-Aug-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to BRCM version 0.8.0-34

- Remove interface priority
- Add action parameter to service discovery functionality

Change-Id: Ibc74c4053996e91f2f577b57695c68c86b5603c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ap_config.c
rc/ap/ap_config.h
rc/p2p/p2p.h
rc/p2p/p2p_i.h
rc/p2p/p2p_sd.c
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/ctrl_iface.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
2fb835aa12088072a839be109acf0f11153857f8 18-Jun-2012 Irfan Sheriff <isheriff@google.com> Restore STA reconnection behavior

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: b/6674338, b/6910598
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

Conflicts:

wpa_supplicant/events.c
pa_supplicant/events.c
9f85c205a5bf1ba3e610cb5804f1cdb919fb1cc7 03-Aug-2012 Irfan Sheriff <isheriff@google.com> am 389b0a35: Merge "Add PKTCNT_POLL command to get TX packet counters" into jb-mr1-dev

* commit '389b0a3504489916caeac883f721403c088b30bf':
Add PKTCNT_POLL command to get TX packet counters
389b0a3504489916caeac883f721403c088b30bf 03-Aug-2012 Irfan Sheriff <isheriff@google.com> Merge "Add PKTCNT_POLL command to get TX packet counters" into jb-mr1-dev
fcd6f21dad589eb6fdba941c98e072ca2664726b 27-Jul-2012 Yuhao Zheng <yuhaozheng@google.com> Add PKTCNT_POLL command to get TX packet counters

- for the new WiFi watchdog
- requires kernel support (see issue 6874044)

Change-Id: Ibb59c1e0df6f5422814f2260588651e0e1490ccc
rc/drivers/driver_nl80211.c
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
pa_supplicant/wpa_cli.c
e5a450edff4b2f93efc844c8f1f656c0899f2c30 03-Aug-2012 Irfan Sheriff <isheriff@google.com> Merge "Add PKTCNT_POLL command to get TX packet counters"
a7ed080837b34158b5cd1920d77dac8b2ad8e4c5 27-Jul-2012 Yuhao Zheng <yuhaozheng@google.com> Add PKTCNT_POLL command to get TX packet counters

- for the new WiFi watchdog
- requires kernel support (see issue 6874044)

Change-Id: I246d91b07ec75684d219facb79a2ee3048ba3646
rc/drivers/driver_nl80211.c
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
pa_supplicant/wpa_cli.c
5e4315286bf0aa8a42495674f14e1cefedeeb4ec 01-Aug-2012 Irfan Sheriff <isheriff@google.com> Merge "Use bssid instead of pending_bssid" into jb-mr1-dev
e78e767aea5576ec0ba7edadfe25fd9dc7dce48f 01-Aug-2012 Irfan Sheriff <isheriff@google.com> Use bssid instead of pending_bssid

pending_bssid is not valid during roaming, use bssid

Bug: 6915644
Change-Id: Ib2181a41845f90812bd7428dbef6433adfe9f749
pa_supplicant/ctrl_iface.c
pa_supplicant/notify.c
e453fb759c34dd0667c16d7716d8a220befdcc87 22-May-2012 Joe Onorato <joeo@google.com> Get rid of LOCAL_MODULE_TAGS := user

Change-Id: I6d9ed4e6e1d94cfedcb703eec4adfe227d35b473
pa_supplicant/Android.mk
ff2bda64334bb7dcc98816e4ac4b515cd2a9667b 26-Jun-2012 jim1_lin <jim1_lin@asus.com> WPS : update dev.config_methods in wps_update_config.

dev.config_methods was not updated when wps_update_config was called.
Led to mismatch config methods between probe_request and M1 packets.
Add missing part for it.

Change-Id: I02bd016a35726c7cf05cd71840082edd677b04b8
pa_supplicant/wps_supplicant.c
058ddafa7d3986f4fdfb883551adc17af73dbc3b 27-Jul-2012 Brian Carlstrom <bdc@google.com> am 9b7656e8: am 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

* commit '9b7656e824c4305c0f9a295bd1162cf05a46e2ff':
Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability
9b7656e824c4305c0f9a295bd1162cf05a46e2ff 27-Jul-2012 Brian Carlstrom <bdc@google.com> am 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

* commit '9a57740cc0a2f4f2a6e72b45eebecab85532599a':
Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability
9a57740cc0a2f4f2a6e72b45eebecab85532599a 27-Jul-2012 Brian Carlstrom <bdc@google.com> Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"
9acd30dba42da1c173cae70ad63e5aff9e3499e5 26-Jul-2012 Brian Carlstrom <bdc@google.com> Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72
Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259

(cherry-picked from 27bf1073abe534644cc1146397082cc78873f516)

Change-Id: I9364e94853a404130125ab8df791193a886fdd34
rc/crypto/tls_openssl.c
21a1e4c6e69742ba96f610b4b0db2e5a2d95528a 27-Jul-2012 Brian Carlstrom <bdc@google.com> am 27bf1073: Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

* commit '27bf1073abe534644cc1146397082cc78873f516':
Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability
27bf1073abe534644cc1146397082cc78873f516 26-Jul-2012 Brian Carlstrom <bdc@google.com> Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72
Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259
Change-Id: Ib53326cc8cd40e800454b7b92586c052bc910ba8
rc/crypto/tls_openssl.c
04949598a23f501be6eec21697465fd46a28840a 19-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to 07-Jul-2012 TOT