• 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 >>>)
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
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
e93dd11e00aa3a511406648774f01db31304323a 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: I1d1b468ca828306669a5d6e0797204dec5117971
ostapd/Android.mk
pa_supplicant/Android.mk
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
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
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
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
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
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
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
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

commit a5ed45586c63ffd8f9d2b44e27c251d7bacbeaf4
Author: Jouni Malinen <j@w1.fi>
Date: Sat Jul 7 13:01:45 2012 +0300

WPS SSDP: Fix socket leaks on error paths

Change-Id: I0864aac7fc88fa2a60f5cca7d524b94363410c85
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/ChangeLog
ostapd/Makefile
ostapd/README-WPS
ostapd/config_file.c
ostapd/config_file.h
ostapd/ctrl_iface.c
ostapd/defconfig
ostapd/hlr_auc_gw.c
ostapd/hostapd.conf
ostapd/hostapd.eap_user
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/accounting.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/ap_list.c
rc/ap/ap_list.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/gas_serv.c
rc/ap/gas_serv.h
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_auth.c
rc/ap/ieee802_11_shared.c
rc/ap/ieee802_11_vht.c
rc/ap/ieee802_1x.c
rc/ap/ieee802_1x.h
rc/ap/pmksa_cache_auth.c
rc/ap/pmksa_cache_auth.h
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/tkip_countermeasures.c
rc/ap/utils.c
rc/ap/wpa_auth.c
rc/ap/wps_hostapd.c
rc/ap/wps_hostapd.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/common/wpa_ctrl.h
rc/crypto/crypto_openssl.c
rc/crypto/dh_group5.c
rc/crypto/dh_group5.h
rc/crypto/random.c
rc/crypto/tls.h
rc/crypto/tls_openssl.c
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_nl80211.c
rc/drivers/driver_privsep.c
rc/drivers/driver_roboswitch.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/driver_wired.c
rc/drivers/nl80211_copy.h
rc/eap_common/eap_defs.h
rc/eap_common/eap_pwd_common.c
rc/eap_common/eap_pwd_common.h
rc/eap_peer/eap.c
rc/eap_peer/eap.h
rc/eap_peer/eap_aka.c
rc/eap_peer/eap_i.h
rc/eap_peer/eap_pwd.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/eap_server_aka.c
rc/eap_server/eap_server_pwd.c
rc/eap_server/eap_server_sim.c
rc/eap_server/eap_sim_db.c
rc/eap_server/eap_sim_db.h
rc/eapol_auth/eapol_auth_sm_i.h
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/l2_packet/l2_packet_freebsd.c
rc/l2_packet/l2_packet_privsep.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_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_das.h
rc/rsn_supp/tdls.c
rc/tls/libtommath.c
rc/utils/build_config.h
rc/utils/common.h
rc/utils/eloop.c
rc/utils/includes.h
rc/utils/pcsc_funcs.c
rc/utils/pcsc_funcs.h
rc/utils/wpa_debug.c
rc/utils/wpa_debug.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_attr_parse.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_er.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
rc/wps/wps_upnp.c
rc/wps/wps_upnp_ssdp.c
pa_supplicant/Android.mk
pa_supplicant/ChangeLog
pa_supplicant/Makefile
pa_supplicant/README
pa_supplicant/README-P2P
pa_supplicant/README-WPS
pa_supplicant/README-Windows.txt
pa_supplicant/android.config
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/autoscan.c
pa_supplicant/autoscan.h
pa_supplicant/autoscan_exponential.c
pa_supplicant/autoscan_periodic.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_common.c
pa_supplicant/dbus/dbus_common.h
pa_supplicant/dbus/dbus_common_i.h
pa_supplicant/dbus/dbus_dict_helpers.c
pa_supplicant/dbus/dbus_dict_helpers.h
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/dbus/dbus_new_handlers_wps.c
pa_supplicant/dbus/dbus_new_helpers.c
pa_supplicant/dbus/dbus_new_helpers.h
pa_supplicant/dbus/dbus_new_introspect.c
pa_supplicant/dbus/dbus_old.c
pa_supplicant/dbus/dbus_old.h
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/dbus/dbus_old_handlers.h
pa_supplicant/dbus/dbus_old_handlers_wps.c
pa_supplicant/defconfig
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/driver_i.h
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/examples/dbus-listen-preq.py
pa_supplicant/hs20_supplicant.c
pa_supplicant/hs20_supplicant.h
pa_supplicant/interworking.c
pa_supplicant/main.c
pa_supplicant/main_symbian.cpp
pa_supplicant/nfc_pw_token.c
pa_supplicant/notify.c
pa_supplicant/notify.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/sme.c
pa_supplicant/sme.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_gui-qt4/signalbar.cpp
pa_supplicant/wpa_gui-qt4/signalbar.h
pa_supplicant/wpa_gui-qt4/wpagui.cpp
pa_supplicant/wpa_priv.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
ce1e0634ed741293de60d5ba3476b26ccbd58ce2 17-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Remove snprintf call from interface= extension

BUG: b/6826116

Change-Id: I35023ce94152a402da94c34083de8ea1387cc758
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface_unix.c
0e6d08e6ec9e3ef3b65a76124d7700d56fe67a8a 10-Jul-2012 Dmitry Shmidt <dimitrysh@google.com> Add 'get_capability channels' command

Change-Id: Ic5d5769b80804d3e8b577e988a1caf1e149b8c01
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
pa_supplicant/wpa_cli.c
fa7bad8a38102d5e3bf9fb4436203b813d611bb2 19-Jun-2012 Irfan Sheriff <isheriff@google.com> Merge "Restore STA reconnection behavior"
7db4ef75f0190d98dbc84f8968ede3ac0ae29571 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: 6674338
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306
pa_supplicant/config_ssid.h
pa_supplicant/events.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
175de9376493bb3d4f4ac07dd928716277f09de5 13-Jun-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix p2p service discovery" into jb-dev
f44b9c4a18d17fbd39901f76a014c32006570fb8 13-Jun-2012 Irfan Sheriff <isheriff@google.com> Fix p2p service discovery

- Fix listen timing to improve SD reliability
- Fix SD packet scheduling

Bug: 6629112
Change-Id: I01365279439116256372d019bdbfd4b2113bf2ce
rc/p2p/p2p.c
rc/p2p/p2p_i.h
rc/p2p/p2p_sd.c
768f9c8b22d9625af61f3e6a7b9a1234b7784f1a 11-Jun-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER" into jb-dev
1f42a6c19a5b3ace255b0e725dd407d10edb44af 11-Jun-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER

Change-Id: I4ee99454838185487065d3acbccf721aecf7f760
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/Android.mk
61dc7fcf73a67f1611a17db5b8170fb468e5137b 06-Jun-2012 Irfan Sheriff <isheriff@google.com> Fix supplicant crash at group removal

Bug: 6613470
Change-Id: Ia96694ce906414b3f56cd57416d7c4c6f2030a6e
pa_supplicant/p2p_supplicant.c
6e95f5f46d53a4c40386e2ef9ec87e56af9e2160 31-May-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: nl80211: Fix message processing

BUG: 6584268

Change-Id: Ib840d6b678a914be4e50d4916fecc1738b2b56f9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
98f9e76624da6bb96edc1982c423e4a119c5170a 30-May-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to Version 0.8.27 from BRCM

- Fix crash during TRUE pbc overlap
- Fix p2p_stop_find event
- Avoid race condition in GO-NEG process if both peers enter
p2p_connect at the same time
- Retry assoc immediately on ASSOC-REJECT. Previously assoc was
retried on authentication timeout (which occurs after 10secs).
Now on assoc reject, we cancel the auth timer and then initiate
a assoc scan.

BUG: 6543705, 6427094

Change-Id: I4489fb14b6cead069f0d14fcbb9e2224f790d77b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_go_neg.c
rc/wps/wps_registrar.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
5b5fb02b225c5c05a4477bef58bdaceede5d68dc 22-May-2012 andy2_kuo <andy2_kuo@asus.com> Fix null pointer access for SSID printing.

Bug [Issue 6517978]

Change-Id: Ife823dce3b8b50c0c3eb0d5a2d8ecf2c8e4ac17e
pa_supplicant/ctrl_iface.c
pa_supplicant/notify.c
c81d5b6205bf762093632de2cd7125de3d10eed5 14-May-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Make Android makefiles available under the BSD license

Change-Id: I8d9e210748d582c6c5e3a62d47276c676ba74080
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
pa_supplicant/wpa_supplicant_conf.mk
pa_supplicant/wpa_supplicant_conf.sh
1029477547084d210cb810e8e5463c628972b315 11-May-2012 Irfan Sheriff <isheriff@google.com> Fix SSID printing in events

Bug: 6476830
Change-Id: I7909fb9fb56737d0d772921d1de2849ca1296679
pa_supplicant/ctrl_iface.c
pa_supplicant/notify.c
2fb777c379ad560c309c54b96c2c13291da23f54 02-May-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Update to Version 0.8.26 from BRCM

- Add interface command
- Improve scan handling during P2P

BUG: b/6324527, b/6427094

Change-Id: I4425f44d2a15de0725ba4a1b42cc56e10954b314
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/p2p/p2p.c
rc/p2p/p2p.h
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
3eb807eec9a305f9a2bc87964925ec81bfc4eb1e 17-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Add SSID in supplicant change event"
f20a4432808cee548326c4b35c83071ca576a239 17-Apr-2012 Irfan Sheriff <isheriff@google.com> Add SSID in supplicant change event

Change-Id: I67224e6765afad51b4b258b0df7d11d7ed3b9927
pa_supplicant/ctrl_iface.c
pa_supplicant/notify.c
9e07767d5d76159ef38a241da00eb0d9f3bc6420 13-Apr-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Fix CONFIG_NO_ROAMING option

Change-Id: I9d4c2c59179f92c82b4a6d8a5b503db8dd859e2c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
01b0175625269a66239cded42c6dc70251ec1211 12-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "P2P: Clear P2P_DEV_SD_INFO when new wildcard SD query is added"
8cb2d2b4c417f3df2c8c1ac2e5b41094abc7c3e4 12-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Revert "Fix service discovery add""
96161876d932a9e995465e9186471cb1b7f80979 12-Apr-2012 Irfan Sheriff <isheriff@google.com> P2P: Clear P2P_DEV_SD_INFO when new wildcard SD query is added

Unlike the unicast SD queries, the queries directed to all peers depend
on P2P_DEV_SD_INFO flag being cleared to allow the query to be sent to
a peer that has previously replied to any SD query.

Change-Id: I1ea3df2ea8df75af3b65d3ffa0c38658d3e3d1ef
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/p2p/p2p_sd.c
f8cf333364de621745989b6c8197ed79b013bd48 12-Apr-2012 Irfan Sheriff <isheriff@google.com> Revert "Fix service discovery add"

This reverts commit 40fa98b45e4e61fcf0cb9292fdf8882b0624bd35.
rc/p2p/p2p_sd.c
21d6bc8c6acd01cd2c4b2abdaf1b0ff58e25aacd 11-Apr-2012 Jouni Malinen <jouni@qca.qualcomm.com> Allow legacy PS param to be set with SET in addition to P2P_SET

Change-Id: I26e19c7d9e303e075f28a4f01a798ac98b52d6e5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
ad4992b130b19979367a50f503c2b74162c71b2d 09-Apr-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "Add to bss command option RANGE=ALL|N1-N2 [MASK=0xH]"
33fd1689363dd194839377b82e3532ee35ca8b96 07-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "P2P: Use P2P Device ID attribute if Device Info not available"
a6328e341c8c1ad0deb8753fdc6f1a49d0a57a92 06-Apr-2012 Irfan Sheriff <isheriff@google.com> P2P: Use P2P Device ID attribute if Device Info not available

The "BSS p2p_dev_addr=address" command uses p2p_parse_dev_addr() to
figure out the P2P Device Address of the GO from scan results. This used
to work only if the P2P IE was received from Probe Response frames since
only those include the P2P Device Info attribute. Make this work with
Beacon frames, too, by using P2P Device ID attribute if the P2P Device
Info attribute is not present.

Change-Id: I3f0a49c22ee02e8971edb9ecd033e74342c318c0
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
rc/p2p/p2p.c
40fa98b45e4e61fcf0cb9292fdf8882b0624bd35 04-Apr-2012 Irfan Sheriff <isheriff@google.com> Fix service discovery add

Change-Id: If621eef6e7a16c83ae520650b8216a5f63488403
rc/p2p/p2p_sd.c
067a17f056511e2761f07340fb3106dd59ad596a 03-Apr-2012 Mike Lockwood <lockwood@google.com> Merge remote-tracking branch 'goog/ics-aah'
f2df2f2f5318f4ce3046b93207fada30fe694069 26-Mar-2012 Dmitry Shmidt <dimitrysh@google.com> Add to bss command option RANGE=ALL|N1-N2 [MASK=0xH]

Add to bss command ability to get information about several bss's in
one call and to limit amount of fields

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/bss.h
pa_supplicant/ctrl_iface.c
pa_supplicant/wpa_cli.c
687922c7347bdc3b4f8c921efe1d1388cb3baac0 26-Mar-2012 Dmitry Shmidt <dimitrysh@google.com> Update to Version 0.8.24 from BRCM

- Add 'conc_priority' command
- Fix handling a single channel concurrency case: If conc_priority
is not set, advertise the frequency conflict to the framework and
disable the new connection attempted
- When P2P Interface gets removed due to single channel frequency
conflict, show GROUP_REMOVE reason=FREQ_CONFLICT
- Fix sched scan processing

Change-Id: Ie6fe105cebd379a0a9c49ace62d2e48e71571107
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/scan.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
db3c5a43353099fd4771f3b7a13efae905878ce9 21-Mar-2012 Kenny Root <kroot@google.com> Use keystore ENGINE for private key operations

The new keystore ENGINE is usable to perform private key operations when
we can't get the actual private key data. This is the case when hardware
crypto is enabled: the private key never leaves the hardware.

Subsequently, we need to be able to talk to OpenSSL ENGINEs that aren't
PKCS#11 or OpenSC. This just changes a few #define variables to allow us
to talk to our keystore engine without having one of those enabled and
without using a PIN.

Change-Id: Iabab5077c3d167a1e13bc8ef8745dc59ad4d62f7
rc/crypto/tls_openssl.c
b638fe75d3cb9d21c67386173f10afe65053cc4d 20-Mar-2012 Dmitry Shmidt <dimitrysh@google.com> nl80211: Use native cfg80211 sta events

Change-Id: Id59cc4af50dbccd283db2ec3e7b0b6f8c2146e68
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
855a5211dedb7fe893681c58ed6d5f693561fe95 20-Mar-2012 Kenny Root <kroot@google.com> Restore OpenSSL ENGINE support

We now use an OpenSSL ENGINE to support keystore functionality.

Change-Id: Ifa654183a86462e1542c58dd39e20ffe11a8edfa
ostapd/Android.mk
pa_supplicant/Android.mk
c5ec7f57ead87efa365800228aa0b09a12d9e6c4 07-Mar-2012 Dmitry Shmidt <dimitrysh@google.com> Update to new version 0.8.22 from BRCM

- Based on 0c01d65 : Ignore TX status for Data frames from not associated
STA

Change-Id: I2776ff8e292593f407bf5b9177640c512e06bf0d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/README
ostapd/config_file.c
ostapd/config_file.h
ostapd/ctrl_iface.c
ostapd/ctrl_iface.h
ostapd/defconfig
ostapd/dump_state.c
ostapd/dump_state.h
ostapd/eap_register.c
ostapd/eap_register.h
ostapd/hlr_auc_gw.c
ostapd/hostapd_cli.c
ostapd/main.c
ostapd/nt_password_hash.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/ap_list.h
rc/ap/ap_mlme.c
rc/ap/ap_mlme.h
rc/ap/authsrv.c
rc/ap/authsrv.h
rc/ap/beacon.c
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/ap/iapp.c
rc/ap/iapp.h
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_shared.c
rc/ap/ieee802_1x.c
rc/ap/ieee802_1x.h
rc/ap/p2p_hostapd.c
rc/ap/p2p_hostapd.h
rc/ap/peerkey_auth.c
rc/ap/pmksa_cache_auth.c
rc/ap/pmksa_cache_auth.h
rc/ap/preauth_auth.c
rc/ap/preauth_auth.h
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/tkip_countermeasures.c
rc/ap/tkip_countermeasures.h
rc/ap/utils.c
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_glue.h
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/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/privsep_commands.h
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/common/wpa_ctrl.c
rc/common/wpa_ctrl.h
rc/crypto/aes-cbc.c
rc/crypto/aes-ctr.c
rc/crypto/aes-eax.c
rc/crypto/aes-encblock.c
rc/crypto/aes-internal-dec.c
rc/crypto/aes-internal-enc.c
rc/crypto/aes-internal.c
rc/crypto/aes-omac1.c
rc/crypto/aes-unwrap.c
rc/crypto/aes-wrap.c
rc/crypto/aes.h
rc/crypto/aes_i.h
rc/crypto/aes_wrap.h
rc/crypto/crypto.h
rc/crypto/crypto_cryptoapi.c
rc/crypto/crypto_gnutls.c
rc/crypto/crypto_internal-cipher.c
rc/crypto/crypto_internal-modexp.c
rc/crypto/crypto_internal-rsa.c
rc/crypto/crypto_internal.c
rc/crypto/crypto_libtomcrypt.c
rc/crypto/crypto_none.c
rc/crypto/crypto_nss.c
rc/crypto/crypto_openssl.c
rc/crypto/des-internal.c
rc/crypto/des_i.h
rc/crypto/dh_group5.c
rc/crypto/dh_group5.h
rc/crypto/dh_groups.c
rc/crypto/dh_groups.h
rc/crypto/fips_prf_cryptoapi.c
rc/crypto/fips_prf_gnutls.c
rc/crypto/fips_prf_internal.c
rc/crypto/fips_prf_nss.c
rc/crypto/fips_prf_openssl.c
rc/crypto/md4-internal.c
rc/crypto/md5-internal.c
rc/crypto/md5-non-fips.c
rc/crypto/md5.c
rc/crypto/md5.h
rc/crypto/md5_i.h
rc/crypto/milenage.c
rc/crypto/milenage.h
rc/crypto/ms_funcs.c
rc/crypto/ms_funcs.h
rc/crypto/random.c
rc/crypto/random.h
rc/crypto/rc4.c
rc/crypto/sha1-internal.c
rc/crypto/sha1-pbkdf2.c
rc/crypto/sha1-tlsprf.c
rc/crypto/sha1-tprf.c
rc/crypto/sha1.c
rc/crypto/sha1.h
rc/crypto/sha1_i.h
rc/crypto/sha256-internal.c
rc/crypto/sha256-tlsprf.c
rc/crypto/sha256.c
rc/crypto/sha256.h
rc/crypto/sha256_i.h
rc/crypto/tls.h
rc/crypto/tls_gnutls.c
rc/crypto/tls_internal.c
rc/crypto/tls_none.c
rc/crypto/tls_nss.c
rc/crypto/tls_openssl.c
rc/crypto/tls_schannel.c
rc/drivers/driver.h
rc/drivers/driver_common.c
rc/drivers/driver_hostap.c
rc/drivers/driver_hostap.h
rc/drivers/driver_ndis.c
rc/drivers/driver_ndis.h
rc/drivers/driver_ndis_.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_none.c
rc/drivers/driver_privsep.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/driver_wext.h
rc/drivers/drivers.c
rc/drivers/linux_ioctl.c
rc/drivers/linux_ioctl.h
rc/drivers/linux_wext.h
rc/drivers/ndis_events.c
rc/drivers/netlink.c
rc/drivers/netlink.h
rc/drivers/nl80211_copy.h
rc/drivers/priv_netlink.h
rc/drivers/rfkill.c
rc/drivers/rfkill.h
rc/eap_common/chap.c
rc/eap_common/chap.h
rc/eap_common/eap_common.c
rc/eap_common/eap_common.h
rc/eap_common/eap_defs.h
rc/eap_common/eap_fast_common.c
rc/eap_common/eap_fast_common.h
rc/eap_common/eap_gpsk_common.c
rc/eap_common/eap_gpsk_common.h
rc/eap_common/eap_ikev2_common.c
rc/eap_common/eap_ikev2_common.h
rc/eap_common/eap_pax_common.c
rc/eap_common/eap_pax_common.h
rc/eap_common/eap_peap_common.c
rc/eap_common/eap_peap_common.h
rc/eap_common/eap_psk_common.c
rc/eap_common/eap_psk_common.h
rc/eap_common/eap_pwd_common.c
rc/eap_common/eap_pwd_common.h
rc/eap_common/eap_sake_common.c
rc/eap_common/eap_sake_common.h
rc/eap_common/eap_sim_common.c
rc/eap_common/eap_sim_common.h
rc/eap_common/eap_tlv_common.h
rc/eap_common/eap_ttls.h
rc/eap_common/eap_wsc_common.c
rc/eap_common/eap_wsc_common.h
rc/eap_common/ikev2_common.c
rc/eap_common/ikev2_common.h
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_fast.c
rc/eap_peer/eap_fast_pac.c
rc/eap_peer/eap_fast_pac.h
rc/eap_peer/eap_gpsk.c
rc/eap_peer/eap_gtc.c
rc/eap_peer/eap_i.h
rc/eap_peer/eap_ikev2.c
rc/eap_peer/eap_leap.c
rc/eap_peer/eap_md5.c
rc/eap_peer/eap_methods.c
rc/eap_peer/eap_methods.h
rc/eap_peer/eap_mschapv2.c
rc/eap_peer/eap_otp.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_tls_common.c
rc/eap_peer/eap_tls_common.h
rc/eap_peer/eap_tnc.c
rc/eap_peer/eap_ttls.c
rc/eap_peer/eap_vendor_test.c
rc/eap_peer/eap_wsc.c
rc/eap_peer/ikev2.c
rc/eap_peer/ikev2.h
rc/eap_peer/mschapv2.c
rc/eap_peer/mschapv2.h
rc/eap_peer/tncc.c
rc/eap_peer/tncc.h
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_aka.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_identity.c
rc/eap_server/eap_server_ikev2.c
rc/eap_server/eap_server_md5.c
rc/eap_server/eap_server_methods.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_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_server_wsc.c
rc/eap_server/eap_sim_db.c
rc/eap_server/eap_sim_db.h
rc/eap_server/eap_tls_common.h
rc/eap_server/ikev2.c
rc/eap_server/ikev2.h
rc/eap_server/tncs.c
rc/eap_server/tncs.h
rc/eapol_auth/eapol_auth_dump.c
rc/eapol_auth/eapol_auth_sm.c
rc/eapol_auth/eapol_auth_sm.h
rc/eapol_auth/eapol_auth_sm_i.h
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/l2_packet/l2_packet.h
rc/l2_packet/l2_packet_linux.c
rc/l2_packet/l2_packet_ndis.c
rc/l2_packet/l2_packet_none.c
rc/l2_packet/l2_packet_pcap.c
rc/l2_packet/l2_packet_privsep.c
rc/l2_packet/l2_packet_winpcap.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_build.c
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_parse.c
rc/p2p/p2p_pd.c
rc/p2p/p2p_sd.c
rc/p2p/p2p_utils.c
rc/radius/radius.c
rc/radius/radius.h
rc/radius/radius_client.c
rc/radius/radius_client.h
rc/radius/radius_server.c
rc/radius/radius_server.h
rc/rsn_supp/peerkey.c
rc/rsn_supp/peerkey.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_ft.c
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
rc/tls/asn1.c
rc/tls/asn1.h
rc/tls/bignum.c
rc/tls/bignum.h
rc/tls/pkcs1.c
rc/tls/pkcs1.h
rc/tls/pkcs5.c
rc/tls/pkcs5.h
rc/tls/pkcs8.c
rc/tls/pkcs8.h
rc/tls/rsa.c
rc/tls/rsa.h
rc/tls/tlsv1_client.c
rc/tls/tlsv1_client.h
rc/tls/tlsv1_client_i.h
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_cred.c
rc/tls/tlsv1_cred.h
rc/tls/tlsv1_record.c
rc/tls/tlsv1_record.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
rc/tls/x509v3.c
rc/tls/x509v3.h
rc/utils/base64.c
rc/utils/base64.h
rc/utils/build_config.h
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.h
rc/utils/eloop_none.c
rc/utils/eloop_win.c
rc/utils/includes.h
rc/utils/ip_addr.c
rc/utils/ip_addr.h
rc/utils/list.h
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/utils/pcsc_funcs.h
rc/utils/state_machine.h
rc/utils/trace.c
rc/utils/trace.h
rc/utils/uuid.c
rc/utils/uuid.h
rc/utils/wpa_debug.c
rc/utils/wpa_debug.h
rc/utils/wpabuf.c
rc/utils/wpabuf.h
rc/wps/http_client.c
rc/wps/http_client.h
rc/wps/http_server.c
rc/wps/http_server.h
rc/wps/httpread.c
rc/wps/httpread.h
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_attr_build.c
rc/wps/wps_attr_parse.c
rc/wps/wps_attr_process.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_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_validate.c
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/bgscan.c
pa_supplicant/bgscan.h
pa_supplicant/bgscan_learn.c
pa_supplicant/bgscan_simple.c
pa_supplicant/blacklist.c
pa_supplicant/blacklist.h
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_none.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface.h
pa_supplicant/ctrl_iface_named_pipe.c
pa_supplicant/ctrl_iface_udp.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/Makefile
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/dbus/dbus_new_handlers_p2p.h
pa_supplicant/dbus/dbus_new_introspect.c
pa_supplicant/dbus/dbus_old_handlers.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/wpas-dbus-new-signals.py
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/main_none.c
pa_supplicant/main_symbian.cpp
pa_supplicant/main_winmain.c
pa_supplicant/main_winsvc.c
pa_supplicant/notify.c
pa_supplicant/notify.h
pa_supplicant/offchannel.c
pa_supplicant/offchannel.h
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/sme.h
pa_supplicant/tests/test_eap_sim_common.c
pa_supplicant/tests/test_wpa.c
pa_supplicant/win_if_list.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_gui-qt4/addinterface.cpp
pa_supplicant/wpa_gui-qt4/addinterface.h
pa_supplicant/wpa_gui-qt4/eventhistory.cpp
pa_supplicant/wpa_gui-qt4/eventhistory.h
pa_supplicant/wpa_gui-qt4/main.cpp
pa_supplicant/wpa_gui-qt4/networkconfig.cpp
pa_supplicant/wpa_gui-qt4/networkconfig.h
pa_supplicant/wpa_gui-qt4/peers.cpp
pa_supplicant/wpa_gui-qt4/peers.h
pa_supplicant/wpa_gui-qt4/scanresults.cpp
pa_supplicant/wpa_gui-qt4/scanresults.h
pa_supplicant/wpa_gui-qt4/stringquery.cpp
pa_supplicant/wpa_gui-qt4/stringquery.h
pa_supplicant/wpa_gui-qt4/userdatarequest.cpp
pa_supplicant/wpa_gui-qt4/userdatarequest.h
pa_supplicant/wpa_gui-qt4/wpagui.cpp
pa_supplicant/wpa_gui-qt4/wpagui.h
pa_supplicant/wpa_gui-qt4/wpamsg.h
pa_supplicant/wpa_passphrase.c
pa_supplicant/wpa_priv.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_glue.h
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
950d1568eb203b1f9e09ecfa7a0ba575ee2f0172 28-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "hostapd: Enable CONFIG_IEEE80211N option"
707d629a91e88ffffd8f0cc7b9baabbf00d0ace1 28-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> hostapd: Enable CONFIG_IEEE80211N option

Change-Id: I86868ac9efa1192c96110c114bfcba25c02d1ae6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/android.config
e5c41fbfc1840bd63ff386e95fb69b084db4e332 22-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> Merge changes If51126b8,I05322cf0

* changes:
wpa_supplicant: Change wpa_supplicant.conf template name
Move .config for Android to android.config
30f94813e7f35e3812c5d31ebc53630c26c4e4b2 22-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Change wpa_supplicant.conf template name

Change-Id: If51126b85bf7c67d308e97e7e48a11d4535ec995
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant.conf.orig
pa_supplicant/wpa_supplicant_conf.mk
pa_supplicant/wpa_supplicant_template.conf
7dd0f2072342a04eeead17ed975b639d89eb4589 22-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> Move .config for Android to android.config

Change-Id: I05322cf024cf63f217802b861a7b2117c9decfda
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/.config
ostapd/Android.mk
ostapd/android.config
pa_supplicant/.config
pa_supplicant/Android.mk
pa_supplicant/android.config
30e144f32477cf3aaf9063b8f63bab9cc31621b7 22-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "wpa_supplicant: Change option CONFIG_ROAMING to CONFIG_NO_ROAMING"
006dedfbfff3ecae6996e5eb85240e42b0e6a7a4 22-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Change option CONFIG_ROAMING to CONFIG_NO_ROAMING

Change-Id: I188968c04cd1fc2c4e6d424bec8aab8003be235e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/.config
pa_supplicant/Android.mk
pa_supplicant/events.c
2587038ae14023e7e597491e5de02e0361fa6452 22-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "Add PLATFORM_VERSION to VERSION_STR_POSTFIX definition"
ea01dacb439e7c408e647f9a7c42f93abe3baaf0 25-Oct-2011 Dmitry Shmidt <dimitrysh@google.com> Add PLATFORM_VERSION to VERSION_STR_POSTFIX definition

Change-Id: I26e4223c58ca941088cc319847da3c7c9d7fef95
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/Android.mk
07311dc4db7c5bbab9ebba7d3f9b9805e6ab7b24 16-Feb-2012 Kenny Root <kroot@google.com> Moving keystore to system/security

keystore used to be in frameworks/base/cmds/keystore, but this include
needs to be changed to support the move to system/security

Change-Id: I583a193593576c2c3c7489fb8c27a29698e8a4c5
ostapd/Android.mk
pa_supplicant/Android.mk
0db96d87ee976168b8eef4caa42312b29d4aa600 06-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "Update to new version 0.8.17 from BRCM"
be18030b5949d199d8f83af36d8cab8a9a97fdba 06-Feb-2012 Dmitry Shmidt <dimitrysh@google.com> Merge "Update to new version 0.8.16 from BRCM"
f6c92c4dd33d21c040e51bcb30beac24173a62b9 26-Jan-2012 Dmitry Shmidt <dimitrysh@google.com> Update to new version 0.8.17 from BRCM

- Suppress scan results notification during p2p_search_in_progress

Change-Id: I971bbfb15983c83d51d050791f58244ecf7050af
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/Android.mk
pa_supplicant/events.c
389685e0417c028335ab5a0a8afc27a5246b0d1d 28-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am f1889e00: Merge "Enable EAP-PWD support in wpa_supplicant."

* commit 'f1889e00dfe14199657e4c603e3d94a3df10ae66':
Enable EAP-PWD support in wpa_supplicant.
f1889e00dfe14199657e4c603e3d94a3df10ae66 27-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Enable EAP-PWD support in wpa_supplicant."
1f69aa52ea2e0a73ac502565df8c666ee49cab6a 25-Jan-2012 Dmitry Shmidt <dimitrysh@google.com> Update to new version 0.8.16 from BRCM

Sync with main tree commit b8349523e460493fa0b4de36c689595109e45e91
Author: Neeraj Kumar Garg <neerajkg@broadcom.com>
Date: Tue Dec 27 23:21:45 2011 +0200
P2P: Reject p2p_group_add if forced frequency is not acceptable

Change-Id: Icb4541a371b05c270e80440d7a7fdea7f33ff61e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
leanSpec.mk
ostapd/Android.mk
ostapd/ChangeLog
ostapd/Makefile
ostapd/config_file.c
ostapd/ctrl_iface.c
ostapd/defconfig
ostapd/dump_state.c
ostapd/hostapd.conf
ostapd/hostapd_cli.c
ostapd/main.c
rc/ap/accounting.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/authsrv.c
rc/ap/beacon.c
rc/ap/beacon.h
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_auth.c
rc/ap/ieee802_11_auth.h
rc/ap/ieee802_11_shared.c
rc/ap/ieee802_1x.c
rc/ap/ieee802_1x.h
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/tkip_countermeasures.c
rc/ap/tkip_countermeasures.h
rc/ap/utils.c
rc/ap/wmm.c
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/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/version.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/aes-internal-dec.c
rc/crypto/aes-internal-enc.c
rc/crypto/crypto.h
rc/crypto/crypto_internal-rsa.c
rc/crypto/crypto_internal.c
rc/crypto/dh_group5.c
rc/crypto/fips_prf_internal.c
rc/crypto/md5-internal.c
rc/crypto/ms_funcs.c
rc/crypto/random.c
rc/crypto/sha1-pbkdf2.c
rc/crypto/sha1-tlsprf.c
rc/crypto/sha1.h
rc/crypto/sha256-internal.c
rc/crypto/sha256-tlsprf.c
rc/crypto/sha256.h
rc/crypto/sha256_i.h
rc/crypto/tls.h
rc/crypto/tls_gnutls.c
rc/crypto/tls_internal.c
rc/crypto/tls_none.c
rc/crypto/tls_nss.c
rc/crypto/tls_openssl.c
rc/crypto/tls_schannel.c
rc/drivers/Apple80211.h
rc/drivers/MobileApple80211.c
rc/drivers/MobileApple80211.h
rc/drivers/android_drv.h
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_broadcom.c
rc/drivers/driver_common.c
rc/drivers/driver_hostap.c
rc/drivers/driver_iphone.m
rc/drivers/driver_madwifi.c
rc/drivers/driver_ndis.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_osx.m
rc/drivers/driver_ralink.c
rc/drivers/driver_ralink.h
rc/drivers/driver_roboswitch.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/driver_wext.h
rc/drivers/drivers.c
rc/drivers/drivers.mak
rc/drivers/drivers.mk
rc/drivers/linux_ioctl.c
rc/drivers/linux_ioctl.h
rc/drivers/linux_wext.h
rc/drivers/netlink.c
rc/drivers/nl80211_copy.h
rc/drivers/wireless_copy.h
rc/eap_common/eap_fast_common.c
rc/eap_common/eap_peap_common.c
rc/eap_common/eap_peap_common.h
rc/eap_common/eap_pwd_common.c
rc/eap_common/eap_pwd_common.h
rc/eap_common/ikev2_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_methods.c
rc/eap_peer/eap_peap.c
rc/eap_peer/eap_pwd.c
rc/eap_peer/eap_sim.c
rc/eap_peer/eap_tls_common.c
rc/eap_peer/eap_tls_common.h
rc/eap_peer/eap_tnc.c
rc/eap_peer/eap_ttls.c
rc/eap_peer/ikev2.c
rc/eap_server/eap.h
rc/eap_server/eap_i.h
rc/eap_server/eap_server.c
rc/eap_server/eap_server_aka.c
rc/eap_server/eap_server_methods.c
rc/eap_server/eap_server_mschapv2.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_tls_common.c
rc/eap_server/eap_server_ttls.c
rc/eap_server/ikev2.c
rc/eapol_auth/eapol_auth_sm.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_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_pd.c
rc/p2p/p2p_sd.c
rc/radius/radius.c
rc/radius/radius.h
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/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
rc/rsn_supp/wpa_ie.h
rc/tls/Makefile
rc/tls/libtommath.c
rc/tls/pkcs5.c
rc/tls/tlsv1_client.c
rc/tls/tlsv1_client.h
rc/tls/tlsv1_client_i.h
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_cred.c
rc/tls/tlsv1_record.c
rc/tls/tlsv1_record.h
rc/tls/tlsv1_server.c
rc/tls/tlsv1_server.h
rc/tls/tlsv1_server_read.c
rc/tls/tlsv1_server_write.c
rc/utils/base64.c
rc/utils/edit.c
rc/utils/eloop.h
rc/utils/includes.h
rc/utils/list.h
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/utils/radiotap.h
rc/utils/wpa_debug.c
rc/utils/wpa_debug.h
rc/wps/upnp_xml.c
rc/wps/upnp_xml.h
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_attr_parse.c
rc/wps/wps_common.c
rc/wps/wps_enrollee.c
rc/wps/wps_er.c
rc/wps/wps_registrar.c
rc/wps/wps_ufd.c
rc/wps/wps_upnp.c
rc/wps/wps_upnp_ssdp.c
rc/wps/wps_upnp_web.c
pa_supplicant/.config
pa_supplicant/.gitignore
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/README
pa_supplicant/README-P2P
pa_supplicant/README-WPS
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/bgscan_learn.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/ctrl_iface.h
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/dbus_dict_helpers.c
pa_supplicant/dbus/dbus_dict_helpers.h
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/dbus/dbus_new_handlers_wps.c
pa_supplicant/dbus/dbus_new_helpers.c
pa_supplicant/dbus/dbus_new_helpers.h
pa_supplicant/dbus/dbus_new_introspect.c
pa_supplicant/dbus/dbus_old.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
pa_supplicant/dbus/fi.w1.wpa_supplicant1.service
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/udhcpd-p2p.conf
pa_supplicant/examples/wps-ap-cli
pa_supplicant/gas_query.c
pa_supplicant/gas_query.h
pa_supplicant/ibss_rsn.c
pa_supplicant/interworking.c
pa_supplicant/interworking.h
pa_supplicant/mlme.c
pa_supplicant/mlme.h
pa_supplicant/notify.c
pa_supplicant/notify.h
pa_supplicant/offchannel.c
pa_supplicant/offchannel.h
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
pa_supplicant/scan.c
pa_supplicant/scan.h
pa_supplicant/sme.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_gui-qt4/scanresults.cpp
pa_supplicant/wpa_gui-qt4/signalbar.cpp
pa_supplicant/wpa_gui-qt4/signalbar.h
pa_supplicant/wpa_gui-qt4/wpa_gui.pro
pa_supplicant/wpa_gui/.gitignore
pa_supplicant/wpa_gui/eventhistory.ui
pa_supplicant/wpa_gui/eventhistory.ui.h
pa_supplicant/wpa_gui/main.cpp
pa_supplicant/wpa_gui/networkconfig.ui
pa_supplicant/wpa_gui/networkconfig.ui.h
pa_supplicant/wpa_gui/scanresults.ui
pa_supplicant/wpa_gui/scanresults.ui.h
pa_supplicant/wpa_gui/setup-mingw-cross-compiling
pa_supplicant/wpa_gui/userdatarequest.ui
pa_supplicant/wpa_gui/userdatarequest.ui.h
pa_supplicant/wpa_gui/wpa_gui.pro
pa_supplicant/wpa_gui/wpagui.ui
pa_supplicant/wpa_gui/wpagui.ui.h
pa_supplicant/wpa_gui/wpamsg.h
pa_supplicant/wpa_priv.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
pa_supplicant/wpas_glue.c
pa_supplicant/wpas_glue.h
pa_supplicant/wps_supplicant.c
f90eb6769391f4b009a03b0a46b6ba8702fce9db 18-Jan-2012 Partha N <parthan@gmail.com> Enable EAP-PWD support in wpa_supplicant.

EAP-pwd (RFC 5931) is an EAP method that uses a shared password for authentication. It has the
simplicity of configuring WPA2-PSK, but comes with the strong authentication of 802.1x.

Change-Id: Ife5b96f61422921a3b3830da16227cca8154e2d3
Signed-off-by: Partha N <parthan@gmail.com>
pa_supplicant/.config
bf5edf439c90418b6f4122ff5e3925123263bda4 12-Jan-2012 Irfan Sheriff <isheriff@google.com> Add network connection event for status

We need both supplicant state and network connection state
for proper sync up with framework

Bug: 5534039
Change-Id: If5094b40f67271e03bc09682749ccd3fd043757b
pa_supplicant/ctrl_iface.c
a8d27d9d466f1fab4601d7fc68fc27af6b41f3b0 06-Jan-2012 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Add EAP-PWD config option

Change-Id: I85ffd4a466cc6b7e6cb8edb42c68b6b57412d926
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/.config
cf5b257bf49076a7cc2fcc7f560689f9e4ee5fc1 19-Dec-2011 Dmitry Shmidt <dimitrysh@google.com> Revert "nl80211: Prolong HANGED message to the wifi manager"

This reverts commit 6dd24fc3792d71edccef9b09140f9a44b063a553.
rc/drivers/driver_nl80211.c
2fd7fa6c75ed351b89297991cc5b5afff08d734c 19-Dec-2011 Dmitry Shmidt <dimitrysh@google.com> Add state message sent after 'status' command

Change-Id: Ife13576e2f96dd9bf588b7d87b01d9fcfc5f57b5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
c14bc82973a9e7b8eb8762d910b0f5ea5546a5d5 17-Nov-2011 Jean-Baptiste Queru <jbq@google.com> am a4d23b81: Enable broadcom-specific patch with proper flag

* commit 'a4d23b8131874ba2380817014f9190b737ce785d':
Enable broadcom-specific patch with proper flag
a4d23b8131874ba2380817014f9190b737ce785d 16-Nov-2011 Jean-Baptiste Queru <jbq@google.com> Enable broadcom-specific patch with proper flag

Change-Id: I5a0f5a2d65963deff3cd62b5e7ec090619c75a2c
ostapd/Android.mk
pa_supplicant/Android.mk
81e9700b8fb135b898181ad3aeb44d39f0a01907 15-Nov-2011 Dmitry Shmidt <dimitrysh@google.com> Allow immediate scan request even if another scan was scheduled later

Change-Id: I4f5c021da9ac66464ad422d65c5855fd72f39b41
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/scan.c
57efce368067aa922da44a1ba7ef7cebfb281090 28-Oct-2011 Ed Heyl <ed@google.com> keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
21cf9d8a2d036b7b45e6adbd2f5a6a3ef625b5b5 26-Oct-2011 Ed Heyl <ed@google.com> undo reset to ics-mr1 until we have a better method
1e755d57e1851b4b5bbcfd7a5a1d4c2d7889a428 26-Oct-2011 Ed Heyl <ed@google.com> reset to ics-mr1, but keep history
95613e49a5d2b830b45757efdb7144fd668f23ae 25-Oct-2011 Dmitry Shmidt <dimitrysh@google.com> Add PLATFORM_VERSION to VERSION_STR_POSTFIX definition

Change-Id: Ia60b5d73cf703fe7d78fc39b58d9d8c121c5d5c6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
648b7492d15bb4efaeebdfdd8bd261563a5f6227 01-Oct-2011 Dmitry Shmidt <dimitrysh@google.com> Set ANDROID_LOG_NAME depending on application

Change-Id: I8ef6f87c92b01a089817a4902d33bf5d0c3a5a7a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
rc/utils/wpa_debug.c
pa_supplicant/Android.mk
b98d1c2746bf93497d587d12b2657cb9b8c5c76c 29-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> am fc41cadc: nl80211: Add get_noa() support for WFD certification (BRCM)

* commit 'fc41cadcff448cdd2b60e376fc6e7378e2e57b5e':
nl80211: Add get_noa() support for WFD certification (BRCM)
fc41cadcff448cdd2b60e376fc6e7378e2e57b5e 28-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> nl80211: Add get_noa() support for WFD certification (BRCM)

BUG: b/5367351

Change-Id: I14ed79e10ade205c5dd4cdc0d2e888ed1279d1bb
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
rc/p2p/p2p_group.c
rc/p2p/p2p_i.h
pa_supplicant/ctrl_iface.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
2b7fea278e437f1fe13970a1e65ca51149223d96 28-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> WEXT: Add signal_poll command support

Change-Id: I9e407905ecde20d745acd41ec48d2e9f7ce84bca
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_wext.c
6e933c1e09094a8972ef1e782c57f8b3c55c91d0 27-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> nl80211: Fix WFD and WPS certification problem for GO (BRCM)

Change-Id: I5bbac818aad7c0a14fddb3beb88a6a2d87c07ea0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
6dd24fc3792d71edccef9b09140f9a44b063a553 08-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> nl80211: Prolong HANGED message to the wifi manager

BUG: b/5167816

Change-Id: I6598304ed9634fc859d2970b0d86213b1dae3696
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
dca3979ccdf869f140f096b83df322a0efc84f22 06-Sep-2011 Dmitry Shmidt <dimitrysh@google.com> P2P fixes for BRCM

1. Fix for stopping any on-going P2P-FIND, while doing a P2P-GROUP-ADD.
2. Fix for Supplicant crash. The crash was due to socket being closed
during P2P-GROUP-REMOVE.
3. Append P2P DEV ADDR during AP-STA-CONNECTED Event for P2P Devices.
For legacy STA, the event format would remain the same.
BUG: b/5262575

Change-Id: I8faf2159d35538fd07e42dba82d367b581cf2164
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/ieee802_1x.c
rc/p2p/p2p.h
rc/p2p/p2p_group.c
pa_supplicant/p2p_supplicant.c
c97d8bf1d6959387a528c901eaf9c0bff47da853 30-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Set buffer length the same as in wpa_supplicant_ctrl_iface_process()

Bug: 5236589

Change-Id: Iae8405aa17d5cc6bbffcff3a37d81df74143aabe
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_cli.c
0dc7a27a4d3b8328028ced3a71bd331e77981166 26-Aug-2011 Irfan Sheriff <isheriff@google.com> Use exact interface as socket parameter for init

For p2p, there are virtual interfaces (like p2p-wlan0-X) created and
that results in binding to the common init socket right now.

Instead, have the init bind fail for p2p interfaces and create seperate
sockets specified by the ctrl_interface path in config file

Bug: 5002384
Change-Id: Ia155df079a0bcca1871b6bcab2ef7111f0cba6c1
pa_supplicant/ctrl_iface_unix.c
44da0253a740e0329b18f60c196e1f2dcacfccea 23-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> BRCM P2P update

- IFNAME for monitor interface is changed to m. from mon. This will
give extra space for incrementing X in IFNAME (p2p-wlan0-X). Also, we
have synced the reset of IFNAME w.r.t. monitor interface name.
- Fixed continuous P2P_DEV_FOUND events coming from GO. Removed the
BRCM specific change for this.
- Fixed STATUS command for p2p interface.

Change-Id: I04210dd0b2bdba06b0192c0a61edfa0e5b47ab72
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/ap/wpa_auth.c
rc/drivers/driver.h
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p_sd.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_supplicant_i.h
e25ba1592df19d46a7a1e1a1fca1fb02ebd7be8f 23-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Fix reporting hidden APs during scan

Change-Id: I2f3274c6f89ac0100331f4987c40e23f36577817
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/scan.c
d3974db87d2f0819ddaa85275069b889ea93f230 19-Aug-2011 repo sync <isheriff@google.com> add cleanspec for hostapd failures

Bug: 5167816
Change-Id: Ic89fab506a119611ce1093eeac958538f9b97bb3
leanSpec.mk
efdec2efdda2f534d84b32f2737ca3d8a00fdf02 16-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Add CONFIG_ROAMING option (off by default)

Change-Id: I846edd8a48e6c5e948732f28caf821055490d320
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/Android.mk
pa_supplicant/events.c
114c3866dda61e84385bb5327f0acf727f2156da 16-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Prevent ap_scan change during association

Change-Id: Ibb13f40b2732a4e6749f40da4a6cf14080b54d73
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant.c
1d43124e4581c52ccca203196d584a4c0772967f 09-Aug-2011 Jean-Baptiste Queru <jbq@google.com> Move libnl headers to their own project

Change-Id: Id1f532a7ea4e583a1f51975cee682b968471dc16
ostapd/Android.mk
pa_supplicant/Android.mk
e15c7b57cc7a214d5adaa0fc1d7204378eaf62a5 04-Aug-2011 Dmitry Shmidt <dimitrysh@google.com> Send termination message only in case of wpa_supplicant_deinit() call

Change-Id: I276e339a35a9b693b604082bd211f6bd7b093808
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_new_handlers.c
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/wpa_supplicant.c
pa_supplicant/wpa_supplicant_i.h
622b66d6efd0cccfeb8623184fadf2f76e7e8206 03-Aug-2011 Irfan Sheriff <isheriff@google.com> Send TERMINATE to framework after a full deinit

Bug: 5102386
Change-Id: I41fc00ae469cf2752fe831db56db22c9ace73f52
pa_supplicant/wpa_supplicant.c
7b8da2ee6c87c38144dae7882a29d98c616a8738 25-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Fix incremental builds by adding Cleanspec step

Change-Id: Id06cc40081a5ff33e015b7aeed8fffd73ef09721
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
leanSpec.mk
497c1d5e50162d6b3c1cce5dbd9c5fd9da69aaef 22-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Add P2P support for BRCM CFG80211 driver

Change-Id: Iafec4bedbd33836d0a64e7ea054d8a46ef8ec204
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/.config
ostapd/Android.mk
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/wpa_auth_ie.c
rc/common/wpa_ctrl.h
rc/drivers/driver_nl80211.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_invitation.c
rc/p2p/p2p_pd.c
pa_supplicant/.config
pa_supplicant/Android.mk
pa_supplicant/ap.c
pa_supplicant/ctrl_iface.c
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
pa_supplicant/p2p_supplicant.h
fa544dac34bd262b9d8b395b4331e241648a7e40 19-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Increase number of SSIDs per scan with ProbeReq to 10

Change-Id: Icab7bc732d652915796a9a0aac1c82d31da8f6b3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver.h
c5da5d2e24c1148757b2493dc351c4adec48360d 16-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Add WPA_UNICODE_SSID support

Change-Id: I1f938b97169d4468ee5b05316826ee509a10d9ad
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/utils/common.c
pa_supplicant/config.c
bbda627478b0e9a312fea4662cd7cd8d6bdf82bf 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I2675273dcbe05c63c366e09a8ba5906ef0314430
ostapd/Android.mk
pa_supplicant/Android.mk
103527c665d221363bbdff08dd5f4f71ccf0621c 07-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Fix incremental builds by adding Cleanspec step

Change-Id: Ie22534dbc05b073322c5072162c42b3d22eb4f78
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
leanSpec.mk
738a26e9e2087b0d43eba3534535632b27b49947 07-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> nl80211: Add private function support

Change-Id: Iba9b2ac21f5c7760900c57826b7048ee58928338
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_nl80211.c
c55524ad84d13014e8019491c2b17e5dcf13545a 07-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Accumulative patch from commit 8fd0f0f323a922aa88ec720ee524f7105d3b0f64

Fix D-Bus build without CONFIG_P2P=y
nl80211: Allow AP mode to be started without monitor interface
nl80211: Process association/disassociation events in AP mode
DBus/P2P: Adding decl for PersistentGroupRemoved signal
DBus/P2P: Rectified type of SecondaryDeviceTypes in device property Get
P2P: Only call dev_lost() for devices that have been dev_found()
wpa_cli: Add missing parameter for P2P_GROUP_ADD command
wpa_supplicant: Respect PKG_CONFIG variable if set in the environment
TLS: Add support for tls_disable_time_checks=1 in client mode
hostapd: Clear keys configured when hostapd reloads configuration
Add dbus signal for information about server certification
Move peer certificate wpa_msg() calls to notify.c
wpa_supplicant AP: Disable AP mode on disassoc paths
wpa_s AP mode: Enable HT20 if driver supports it
Allow PMKSA caching to be disabled on Authenticator
FT: Disable PMKSA cache for FT-IEEE8021X
FT: Clear SME ft_used/ft_ies when disconnecting
8fd0f0f323a922aa88ec720ee524f7105d3b0f64

Change-Id: I6ae333196c36ffa7589662d5269fabfc3b994605
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/config_file.c
ostapd/hostapd.conf
rc/ap/ap_config.h
rc/ap/hostapd.c
rc/ap/wpa_auth.c
rc/ap/wpa_auth.h
rc/ap/wpa_auth_glue.c
rc/crypto/tls_internal.c
rc/crypto/tls_openssl.c
rc/drivers/driver_nl80211.c
rc/eap_peer/eap.c
rc/eap_peer/eap.h
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/p2p/p2p.c
rc/rsn_supp/wpa.c
rc/tls/tlsv1_client.c
rc/tls/tlsv1_client.h
rc/tls/tlsv1_client_i.h
rc/tls/tlsv1_client_read.c
rc/tls/tlsv1_server_read.c
rc/tls/x509v3.c
rc/tls/x509v3.h
pa_supplicant/Android.mk
pa_supplicant/Makefile
pa_supplicant/ap.c
pa_supplicant/dbus/Makefile
pa_supplicant/dbus/dbus_new.c
pa_supplicant/dbus/dbus_new.h
pa_supplicant/dbus/dbus_new_handlers_p2p.c
pa_supplicant/dbus/dbus_old.c
pa_supplicant/dbus/dbus_old.h
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/notify.c
pa_supplicant/notify.h
pa_supplicant/wpa_cli.c
pa_supplicant/wpas_glue.c
13970b010f3e5b274336677311a5586410ecc8fa 01-Jul-2011 Dmitry Shmidt <dimitrysh@google.com> Update Android.mk files

Change-Id: I43a00f59599d6d6faf538dc0bb595f95ada3014b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/Android.mk
pa_supplicant/Android.mk
a772296a3a934661ad66a83744b7f63309248651 01-Jul-2011 Jason Chen <jasonchen@google.com> Fix incremental builds by adding Cleanspec step

Change-Id: I5a4733b4d70525bb5fa8d798465d67c253e50571
leanSpec.mk
75ecf5267604f166b85a7ee2cf0d9cb682966680 28-Jun-2011 Jouni Malinen <jouni@qca.qualcomm.com> Accumulative patch from commit 20a0b03debef66cc57b0c34a05f8be5229be907c

atheros: Fix auth_alg configuration for static WEP
nl80211: Implement set_rate_sets for non-hostapd AP case
nl80211: Enable more AP callbacks for non-hostapd AP mode
nl80211: Re-order functions to group AP/hostapd specific code
Remove compiler warning for non-P2P builds
random: Add support for maintaining internal entropy store over restarts
Fix a compiler warning on WPS-AP-without-UPnP builds
P2P: Retry provision discovery requests in IDLE state
P2P: Add callback for provision discovery failure
P2P: Add wpas_notify_p2p_provision_discovery()
P2P: Add group started notification
DBus: Move wpas_dbus_new_decompose_object_path()
DBus: Refactor array adding, add binary arrays
DBus: Add support for P2P primitives
DBus: Fix some typos on comments
Fix CONFIG_AP=y build without CONFIG_P2P=y
Fix non-P2P D-Bus build
nl80211: Add support for driver-based PMKSA cache
P2P: Start GO without extra scan step
Remove a compiler warning on uninitialized variable
Add EVENT_RX_ACTION handler for hostapd
Fix hostapd build without NEED_AP_MLME=y
Fix AP selection to check privacy mismatch and IBSS with WPA/RSN IE
bsd: Fix set_key() sequence number endian issue
Add a copyright and license statement for a radiotap header file
Use nl80211 as an example instead of WEXT
Add notes for CONFIG_WPS_ER build configuration option
Fix CONFIG_NO_WPA_PASSPHRASE=y build
hostapd: Don't mask out non-symmetric STA HT caps
P2P: Enable P2P capability advertisement on D-Bus
P2P: Update D-Bus network object semantics during group formation
P2P: Show P2P peer signal level in D-Bus P2P device properties
P2P: Fix P2P device signal level type in D-Bus
P2P: Add dissasoc_low_ack in P2P device properties
P2P: More complete persistent group management over D-Bus
P2P: Add WpsFailed signal in P2P D-Bus
P2P: Update listen and operating channel from P2P D-Bus
P2P: Fix WpsFailed signal in P2P D-Bus
atheros: Fix glibc 'invalid pointer' error when WPA_TRACE is enabled
Clear WPA and EAPOL state machine config pointer on network removal
20a0b03debef66cc57b0c34a05f8be5229be907c

Change-Id: I2b83bf86ba9c7a9a218638be7b4de31d209cdde1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/defconfig
ostapd/main.c
rc/ap/ap_drv_ops.h
rc/ap/drv_callbacks.c
rc/ap/hostapd.c
rc/ap/ieee802_11_ht.c
rc/ap/ieee802_1x.c
rc/ap/wps_hostapd.c
rc/crypto/random.c
rc/crypto/random.h
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_bsd.c
rc/drivers/driver_nl80211.c
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_i.h
rc/p2p/p2p_pd.c
rc/utils/radiotap_iter.h
pa_supplicant/Makefile
pa_supplicant/README-WPS
pa_supplicant/ap.c
pa_supplicant/config.h
pa_supplicant/ctrl_iface.c
pa_supplicant/dbus/dbus_dict_helpers.c
pa_supplicant/dbus/dbus_dict_helpers.h
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/dbus/dbus_new_helpers.c
pa_supplicant/dbus/dbus_new_helpers.h
pa_supplicant/defconfig
pa_supplicant/events.c
pa_supplicant/main.c
pa_supplicant/notify.c
pa_supplicant/notify.h
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
e61a2d6db6113da5fad91660764afdb0596dbc46 27-Jun-2011 Dmitry Shmidt <dimitrysh@google.com> Remove unnecessary compilation settings

Change-Id: I59171b3620f4274d50f2cd764db493048e3c21b5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ostapd/.config
ostapd/Android.mk
pa_supplicant/Android.mk
87255c406b47ce027832c461a2f731b23a987f96 03-Jun-2011 Dmitry Shmidt <dimitrysh@google.com> Set cleanspec for wpa_supplicant and wpa_cli

Change-Id: I201b899d81ebabfd69acb186525592151bf3a6db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
leanSpec.mk
8492211a441c6f046d6cd8ea6f21d614268a8221 01-Jun-2011 Dmitry Shmidt <dimitrysh@google.com> Add makefile for wpa_supplicant.conf

Change-Id: Ibb631dbfae130a90ac6b9ef53e818df7dd561b17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant.conf
pa_supplicant/wpa_supplicant.conf.orig
pa_supplicant/wpa_supplicant_conf.mk
pa_supplicant/wpa_supplicant_conf.sh
c725c8da2952f57ace79dff6e94d96d532395d8a 01-Jun-2011 Dmitry Shmidt <dimitrysh@google.com> Add terminate message when wpa_supplicant is stopped

Change-Id: I062f4c2aa31a8d0c0c4fe107f101b71057850f18
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_supplicant.c
87fd279308af3f806848c8f2ab65ef18c6ac4c30 16-May-2011 Jouni Malinen <jouni.malinen@atheros.com> Accumulative patch from commit 6d28fb9627155929012cda944aacd5a52ce7051a

nl80211: Fetch assoc_freq from scan table for connect event
nl80211: Filter out duplicated BSS table entries from scan results
Update BSS table entry if roaming event indicates frequency change
WPS: Remove obsolete note about lack for WPS ER support
P2P: Include operating class 124 (channels 149,153,157,161)
Include nl80211 driver wrapper in default configuration for hostapd
Better messages when channel cannot be used in AP mode
WPS: Add a workaround for Windows 7 capability discovery for PBC
WPS UPnP: Fix UPnP initialization for non-bridge case with some drivers
Fix regression in RSN pre-authentication candidate list generation
commit 6d28fb9627155929012cda944aacd5a52ce7051a

Change-Id: I3c68dad5fe323b1d86aa585c564a75e4fc1a2ea1
ostapd/config_file.c
ostapd/defconfig
ostapd/hostapd.conf
rc/ap/ap_config.h
rc/ap/hostapd.c
rc/ap/hw_features.c
rc/ap/hw_features.h
rc/ap/ieee802_1x.c
rc/ap/wps_hostapd.c
rc/ap/wps_hostapd.h
rc/drivers/driver_nl80211.c
rc/eap_server/eap.h
rc/eap_server/eap_i.h
rc/eap_server/eap_server.c
rc/eap_server/eap_server_wsc.c
rc/eapol_auth/eapol_auth_sm.c
rc/eapol_auth/eapol_auth_sm.h
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_enrollee.c
rc/wps/wps_i.h
pa_supplicant/README-WPS
pa_supplicant/events.c
pa_supplicant/p2p_supplicant.c
29991f40caccd6c45cd7c56ca597f370a4f2b9eb 25-May-2011 Dmitry Shmidt <dimitrysh@google.com> WEXT: Suppress additional DISASSOCIATE events

Change-Id: Id65428908bca59e71a3ab479b63d992eff96e433
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_wext.c
886c3ff164ee2c0e281f4b1f31ce2b00f045f9de 25-May-2011 Dmitry Shmidt <dimitrysh@google.com> WEXT: Add accumulative Android patch

Change-Id: I167f3a5e8513645a4693672f44b6df369a3f97fe
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver_wext.c
rc/drivers/driver_wext.h
405b5aff6d655ee9a28652b5cbce47b320573ec5 09-May-2011 Dmitry Shmidt <dimitrysh@google.com> Add TDLS support to Android.mk

Change-Id: I3366be4774ea19a7c8ae27174e84c9a01b53af01
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/Android.mk
bd567ad93e03f285fdad93464100148cd5ae7941 09-May-2011 Dmitry Shmidt <dimitrysh@google.com> Add extended 'driver' command

Change-Id: Ib589f44f471c1198973ee0a0695b90097fcc9b33
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
rc/drivers/driver.h
pa_supplicant/ctrl_iface.c
pa_supplicant/driver_i.h
0716c12e57090ce9904fb5948da1285fc36c1fe4 09-Apr-2011 Dmitry Shmidt <dimitrysh@google.com> wpa_cli: Add 'driver' command support

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_cli.c
43007fd3a75a07189a11510e131216284b48e098 12-Apr-2011 Dmitry Shmidt <dimitrysh@google.com> Set ap_scan to default in case of disassociation

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/events.c
20df807cb700c516ff346732f1bc8f914d0d26d8 09-Apr-2011 Dmitry Shmidt <dimitrysh@google.com> Fix scan notification in case of canceling scan

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/scan.c
6f3bdcf8c96ad38245e927ac1afe28b98621a4e5 20-Apr-2011 Dmitry Shmidt <dimitrysh@google.com> Add 'get country' command

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
696359e14f6a38ce3cecb98021562c0252021960 16-Mar-2011 Dmitry Shmidt <dimitrysh@google.com> wpa_cli: Add blacklist and log_level commands

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/wpa_cli.c
657a704326e96437d8edaf37fcb6c354b7114358 16-Mar-2011 Dmitry Shmidt <dimitrysh@google.com> Add log_level command

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
e19501da312b59453448d587376062d5b3053a58 16-Mar-2011 Dmitry Shmidt <dimitrysh@google.com> Add blacklist command

This command allows to network manager to avoid AP

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
pa_supplicant/ctrl_iface.c
8d520ff1dc2da35cdca849e982051b86468016d8 09-May-2011 Dmitry Shmidt <dimitrysh@google.com> wpa_supplicant: Initial Revision 0.8.X

Based on:
commit 0725cc7b7efc434910e89865c42eda7ce61bbf08
Author: Jouni Malinen <j@w1.fi>
Date: Thu Apr 21 20:41:01 2011 +0300

Enable CONFIG_DRIVER_NL80211=y in the default configuration

nl80211 should be preferred over WEXT with any recent Linux
kernel version.

Change-Id: I26aec5afbbd4f4a1f5fd900912545b6f5050de64
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
gitignore
ndroid.mk
OPYING
leanSpec.mk
ODULE_LICENSE_BSD_LIKE
EADME
ostapd/.config
ostapd/Android.mk
ostapd/ChangeLog
ostapd/Makefile
ostapd/README
ostapd/README-WPS
ostapd/config_file.c
ostapd/config_file.h
ostapd/ctrl_iface.c
ostapd/ctrl_iface.h
ostapd/defconfig
ostapd/dump_state.c
ostapd/dump_state.h
ostapd/eap_register.c
ostapd/eap_register.h
ostapd/eap_testing.txt
ostapd/hlr_auc_gw.c
ostapd/hlr_auc_gw.milenage_db
ostapd/hostapd.8
ostapd/hostapd.accept
ostapd/hostapd.conf
ostapd/hostapd.deny
ostapd/hostapd.eap_user
ostapd/hostapd.radius_clients
ostapd/hostapd.sim_db
ostapd/hostapd.vlan
ostapd/hostapd.wpa_psk
ostapd/hostapd_cli.1
ostapd/hostapd_cli.c
ostapd/logwatch/README
ostapd/logwatch/hostapd
ostapd/logwatch/hostapd.conf
ostapd/main.c
ostapd/nt_password_hash.c
ostapd/wired.conf
rc
rc/Makefile
rc/ap/Makefile
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/ap_list.h
rc/ap/ap_mlme.c
rc/ap/ap_mlme.h
rc/ap/authsrv.c
rc/ap/authsrv.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/ap/hw_features.c
rc/ap/hw_features.h
rc/ap/iapp.c
rc/ap/iapp.h
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_ht.c
rc/ap/ieee802_1x.c
rc/ap/ieee802_1x.h
rc/ap/p2p_hostapd.c
rc/ap/p2p_hostapd.h
rc/ap/peerkey_auth.c
rc/ap/pmksa_cache_auth.c
rc/ap/pmksa_cache_auth.h
rc/ap/preauth_auth.c
rc/ap/preauth_auth.h
rc/ap/sta_info.c
rc/ap/sta_info.h
rc/ap/tkip_countermeasures.c
rc/ap/tkip_countermeasures.h
rc/ap/utils.c
rc/ap/vlan_init.c
rc/ap/vlan_init.h
rc/ap/wmm.c
rc/ap/wmm.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_glue.h
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/Makefile
rc/common/defs.h
rc/common/eapol_common.h
rc/common/ieee802_11_common.c
rc/common/ieee802_11_common.h
rc/common/ieee802_11_defs.h
rc/common/privsep_commands.h
rc/common/version.h
rc/common/wpa_common.c
rc/common/wpa_common.h
rc/common/wpa_ctrl.c
rc/common/wpa_ctrl.h
rc/crypto/.gitignore
rc/crypto/Makefile
rc/crypto/aes-cbc.c
rc/crypto/aes-ctr.c
rc/crypto/aes-eax.c
rc/crypto/aes-encblock.c
rc/crypto/aes-internal-dec.c
rc/crypto/aes-internal-enc.c
rc/crypto/aes-internal.c
rc/crypto/aes-omac1.c
rc/crypto/aes-unwrap.c
rc/crypto/aes-wrap.c
rc/crypto/aes.h
rc/crypto/aes_i.h
rc/crypto/aes_wrap.h
rc/crypto/crypto.h
rc/crypto/crypto_cryptoapi.c
rc/crypto/crypto_gnutls.c
rc/crypto/crypto_internal-cipher.c
rc/crypto/crypto_internal-modexp.c
rc/crypto/crypto_internal-rsa.c
rc/crypto/crypto_internal.c
rc/crypto/crypto_libtomcrypt.c
rc/crypto/crypto_none.c
rc/crypto/crypto_nss.c
rc/crypto/crypto_openssl.c
rc/crypto/des-internal.c
rc/crypto/des_i.h
rc/crypto/dh_group5.c
rc/crypto/dh_group5.h
rc/crypto/dh_groups.c
rc/crypto/dh_groups.h
rc/crypto/fips_prf_cryptoapi.c
rc/crypto/fips_prf_gnutls.c
rc/crypto/fips_prf_internal.c
rc/crypto/fips_prf_nss.c
rc/crypto/fips_prf_openssl.c
rc/crypto/md4-internal.c
rc/crypto/md5-internal.c
rc/crypto/md5-non-fips.c
rc/crypto/md5.c
rc/crypto/md5.h
rc/crypto/md5_i.h
rc/crypto/milenage.c
rc/crypto/milenage.h
rc/crypto/ms_funcs.c
rc/crypto/ms_funcs.h
rc/crypto/random.c
rc/crypto/random.h
rc/crypto/rc4.c
rc/crypto/sha1-internal.c
rc/crypto/sha1-pbkdf2.c
rc/crypto/sha1-tlsprf.c
rc/crypto/sha1-tprf.c
rc/crypto/sha1.c
rc/crypto/sha1.h
rc/crypto/sha1_i.h
rc/crypto/sha256-internal.c
rc/crypto/sha256.c
rc/crypto/sha256.h
rc/crypto/tls.h
rc/crypto/tls_gnutls.c
rc/crypto/tls_internal.c
rc/crypto/tls_none.c
rc/crypto/tls_nss.c
rc/crypto/tls_openssl.c
rc/crypto/tls_schannel.c
rc/drivers/.gitignore
rc/drivers/Apple80211.h
rc/drivers/Makefile
rc/drivers/MobileApple80211.c
rc/drivers/MobileApple80211.h
rc/drivers/driver.h
rc/drivers/driver_atheros.c
rc/drivers/driver_broadcom.c
rc/drivers/driver_bsd.c
rc/drivers/driver_hostap.c
rc/drivers/driver_hostap.h
rc/drivers/driver_iphone.m
rc/drivers/driver_madwifi.c
rc/drivers/driver_ndis.c
rc/drivers/driver_ndis.h
rc/drivers/driver_ndis_.c
rc/drivers/driver_nl80211.c
rc/drivers/driver_none.c
rc/drivers/driver_osx.m
rc/drivers/driver_privsep.c
rc/drivers/driver_ralink.c
rc/drivers/driver_ralink.h
rc/drivers/driver_roboswitch.c
rc/drivers/driver_test.c
rc/drivers/driver_wext.c
rc/drivers/driver_wext.h
rc/drivers/driver_wired.c
rc/drivers/drivers.c
rc/drivers/drivers.mak
rc/drivers/drivers.mk
rc/drivers/linux_ioctl.c
rc/drivers/linux_ioctl.h
rc/drivers/ndis_events.c
rc/drivers/netlink.c
rc/drivers/netlink.h
rc/drivers/nl80211_copy.h
rc/drivers/priv_netlink.h
rc/drivers/rfkill.c
rc/drivers/rfkill.h
rc/drivers/wireless_copy.h
rc/eap_common/Makefile
rc/eap_common/chap.c
rc/eap_common/chap.h
rc/eap_common/eap_common.c
rc/eap_common/eap_common.h
rc/eap_common/eap_defs.h
rc/eap_common/eap_fast_common.c
rc/eap_common/eap_fast_common.h
rc/eap_common/eap_gpsk_common.c
rc/eap_common/eap_gpsk_common.h
rc/eap_common/eap_ikev2_common.c
rc/eap_common/eap_ikev2_common.h
rc/eap_common/eap_pax_common.c
rc/eap_common/eap_pax_common.h
rc/eap_common/eap_peap_common.c
rc/eap_common/eap_peap_common.h
rc/eap_common/eap_psk_common.c
rc/eap_common/eap_psk_common.h
rc/eap_common/eap_pwd_common.c
rc/eap_common/eap_pwd_common.h
rc/eap_common/eap_sake_common.c
rc/eap_common/eap_sake_common.h
rc/eap_common/eap_sim_common.c
rc/eap_common/eap_sim_common.h
rc/eap_common/eap_tlv_common.h
rc/eap_common/eap_ttls.h
rc/eap_common/eap_wsc_common.c
rc/eap_common/eap_wsc_common.h
rc/eap_common/ikev2_common.c
rc/eap_common/ikev2_common.h
rc/eap_peer/Makefile
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_fast.c
rc/eap_peer/eap_fast_pac.c
rc/eap_peer/eap_fast_pac.h
rc/eap_peer/eap_gpsk.c
rc/eap_peer/eap_gtc.c
rc/eap_peer/eap_i.h
rc/eap_peer/eap_ikev2.c
rc/eap_peer/eap_leap.c
rc/eap_peer/eap_md5.c
rc/eap_peer/eap_methods.c
rc/eap_peer/eap_methods.h
rc/eap_peer/eap_mschapv2.c
rc/eap_peer/eap_otp.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_tls_common.c
rc/eap_peer/eap_tls_common.h
rc/eap_peer/eap_tnc.c
rc/eap_peer/eap_ttls.c
rc/eap_peer/eap_vendor_test.c
rc/eap_peer/eap_wsc.c
rc/eap_peer/ikev2.c
rc/eap_peer/ikev2.h
rc/eap_peer/mschapv2.c
rc/eap_peer/mschapv2.h
rc/eap_peer/tncc.c
rc/eap_peer/tncc.h
rc/eap_server/Makefile
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_aka.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_identity.c
rc/eap_server/eap_server_ikev2.c
rc/eap_server/eap_server_md5.c
rc/eap_server/eap_server_methods.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_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_server_wsc.c
rc/eap_server/eap_sim_db.c
rc/eap_server/eap_sim_db.h
rc/eap_server/eap_tls_common.h
rc/eap_server/ikev2.c
rc/eap_server/ikev2.h
rc/eap_server/tncs.c
rc/eap_server/tncs.h
rc/eapol_auth/Makefile
rc/eapol_auth/eapol_auth_dump.c
rc/eapol_auth/eapol_auth_sm.c
rc/eapol_auth/eapol_auth_sm.h
rc/eapol_auth/eapol_auth_sm_i.h
rc/eapol_supp/Makefile
rc/eapol_supp/eapol_supp_sm.c
rc/eapol_supp/eapol_supp_sm.h
rc/l2_packet/Makefile
rc/l2_packet/l2_packet.h
rc/l2_packet/l2_packet_freebsd.c
rc/l2_packet/l2_packet_linux.c
rc/l2_packet/l2_packet_ndis.c
rc/l2_packet/l2_packet_none.c
rc/l2_packet/l2_packet_pcap.c
rc/l2_packet/l2_packet_privsep.c
rc/l2_packet/l2_packet_winpcap.c
rc/lib.rules
rc/p2p/Makefile
rc/p2p/p2p.c
rc/p2p/p2p.h
rc/p2p/p2p_build.c
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_parse.c
rc/p2p/p2p_pd.c
rc/p2p/p2p_sd.c
rc/p2p/p2p_utils.c
rc/radius/.gitignore
rc/radius/Makefile
rc/radius/radius.c
rc/radius/radius.h
rc/radius/radius_client.c
rc/radius/radius_client.h
rc/radius/radius_server.c
rc/radius/radius_server.h
rc/rsn_supp/Makefile
rc/rsn_supp/peerkey.c
rc/rsn_supp/peerkey.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_ft.c
rc/rsn_supp/wpa_i.h
rc/rsn_supp/wpa_ie.c
rc/rsn_supp/wpa_ie.h
rc/tls/.gitignore
rc/tls/Makefile
rc/tls/asn1.c
rc/tls/asn1.h
rc/tls/bignum.c
rc/tls/bignum.h
rc/tls/libtommath.c
rc/tls/pkcs1.c
rc/tls/pkcs1.h
rc/tls/pkcs5.c
rc/tls/pkcs5.h
rc/tls/pkcs8.c
rc/tls/pkcs8.h
rc/tls/rsa.c
rc/tls/rsa.h
rc/tls/tlsv1_client.c
rc/tls/tlsv1_client.h
rc/tls/tlsv1_client_i.h
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_cred.c
rc/tls/tlsv1_cred.h
rc/tls/tlsv1_record.c
rc/tls/tlsv1_record.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
rc/tls/x509v3.c
rc/tls/x509v3.h
rc/utils/.gitignore
rc/utils/Makefile
rc/utils/base64.c
rc/utils/base64.h
rc/utils/build_config.h
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.h
rc/utils/eloop_none.c
rc/utils/eloop_win.c
rc/utils/includes.h
rc/utils/ip_addr.c
rc/utils/ip_addr.h
rc/utils/list.h
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/utils/pcsc_funcs.h
rc/utils/radiotap.c
rc/utils/radiotap.h
rc/utils/radiotap_iter.h
rc/utils/state_machine.h
rc/utils/trace.c
rc/utils/trace.h
rc/utils/uuid.c
rc/utils/uuid.h
rc/utils/wpa_debug.c
rc/utils/wpa_debug.h
rc/utils/wpabuf.c
rc/utils/wpabuf.h
rc/wps/Makefile
rc/wps/http.h
rc/wps/http_client.c
rc/wps/http_client.h
rc/wps/http_server.c
rc/wps/http_server.h
rc/wps/httpread.c
rc/wps/httpread.h
rc/wps/ndef.c
rc/wps/upnp_xml.c
rc/wps/upnp_xml.h
rc/wps/wps.c
rc/wps/wps.h
rc/wps/wps_attr_build.c
rc/wps/wps_attr_parse.c
rc/wps/wps_attr_process.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_er.h
rc/wps/wps_er_ssdp.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
rc/wps/wps_upnp.c
rc/wps/wps_upnp.h
rc/wps/wps_upnp_ap.c
rc/wps/wps_upnp_event.c
rc/wps/wps_upnp_i.h
rc/wps/wps_upnp_ssdp.c
rc/wps/wps_upnp_web.c
rc/wps/wps_validate.c
pa_supplicant/.config
pa_supplicant/Android.mk
pa_supplicant/ChangeLog
pa_supplicant/Makefile
pa_supplicant/README
pa_supplicant/README-P2P
pa_supplicant/README-WPS
pa_supplicant/README-Windows.txt
pa_supplicant/ap.c
pa_supplicant/ap.h
pa_supplicant/bgscan.c
pa_supplicant/bgscan.h
pa_supplicant/bgscan_learn.c
pa_supplicant/bgscan_simple.c
pa_supplicant/blacklist.c
pa_supplicant/blacklist.h
pa_supplicant/bss.c
pa_supplicant/bss.h
pa_supplicant/config.c
pa_supplicant/config.h
pa_supplicant/config_file.c
pa_supplicant/config_none.c
pa_supplicant/config_ssid.h
pa_supplicant/config_winreg.c
pa_supplicant/ctrl_iface.c
pa_supplicant/ctrl_iface.h
pa_supplicant/ctrl_iface_named_pipe.c
pa_supplicant/ctrl_iface_udp.c
pa_supplicant/ctrl_iface_unix.c
pa_supplicant/dbus/.gitignore
pa_supplicant/dbus/Makefile
pa_supplicant/dbus/dbus-wpa_supplicant.conf
pa_supplicant/dbus/dbus_common.c
pa_supplicant/dbus/dbus_common.h
pa_supplicant/dbus/dbus_common_i.h
pa_supplicant/dbus/dbus_dict_helpers.c
pa_supplicant/dbus/dbus_dict_helpers.h
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_new_helpers.c
pa_supplicant/dbus/dbus_new_helpers.h
pa_supplicant/dbus/dbus_new_introspect.c
pa_supplicant/dbus/dbus_old.c
pa_supplicant/dbus/dbus_old.h
pa_supplicant/dbus/dbus_old_handlers.c
pa_supplicant/dbus/dbus_old_handlers.h
pa_supplicant/dbus/dbus_old_handlers_wps.c
pa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
pa_supplicant/dbus/fi.w1.wpa_supplicant1.service
pa_supplicant/defconfig
pa_supplicant/doc/docbook/.gitignore
pa_supplicant/doc/docbook/Makefile
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.conf.sgml
pa_supplicant/doc/docbook/wpa_supplicant.sgml
pa_supplicant/driver_i.h
pa_supplicant/eap_register.c
pa_supplicant/eap_testing.txt
pa_supplicant/eapol_test.c
pa_supplicant/events.c
pa_supplicant/examples/60_wpa_supplicant
pa_supplicant/examples/ieee8021x.conf
pa_supplicant/examples/openCryptoki.conf
pa_supplicant/examples/p2p-action-udhcp.sh
pa_supplicant/examples/p2p-action.sh
pa_supplicant/examples/plaintext.conf
pa_supplicant/examples/udhcpd-p2p.conf
pa_supplicant/examples/wep.conf
pa_supplicant/examples/wpa-psk-tkip.conf
pa_supplicant/examples/wpa2-eap-ccmp.conf
pa_supplicant/examples/wpas-dbus-new-getall.py
pa_supplicant/examples/wpas-dbus-new-signals.py
pa_supplicant/examples/wpas-dbus-new-wps.py
pa_supplicant/examples/wpas-dbus-new.py
pa_supplicant/examples/wpas-test.py
pa_supplicant/ibss_rsn.c
pa_supplicant/ibss_rsn.h
pa_supplicant/main.c
pa_supplicant/main_none.c
pa_supplicant/main_symbian.cpp
pa_supplicant/main_winmain.c
pa_supplicant/main_winsvc.c
pa_supplicant/mlme.c
pa_supplicant/mlme.h
pa_supplicant/nmake.mak
pa_supplicant/notify.c
pa_supplicant/notify.h
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/sme.h
pa_supplicant/tests/link_test.c
pa_supplicant/tests/test_eap_sim_common.c
pa_supplicant/tests/test_wpa.c
pa_supplicant/todo.txt
pa_supplicant/win_if_list.c
pa_supplicant/wpa_cli.c
pa_supplicant/wpa_gui-qt4/.gitignore
pa_supplicant/wpa_gui-qt4/addinterface.cpp
pa_supplicant/wpa_gui-qt4/addinterface.h
pa_supplicant/wpa_gui-qt4/eventhistory.cpp
pa_supplicant/wpa_gui-qt4/eventhistory.h
pa_supplicant/wpa_gui-qt4/eventhistory.ui
pa_supplicant/wpa_gui-qt4/icons.qrc
pa_supplicant/wpa_gui-qt4/icons/Makefile
pa_supplicant/wpa_gui-qt4/icons/README
pa_supplicant/wpa_gui-qt4/icons/ap.svg
pa_supplicant/wpa_gui-qt4/icons/group.svg
pa_supplicant/wpa_gui-qt4/icons/invitation.svg
pa_supplicant/wpa_gui-qt4/icons/laptop.svg
pa_supplicant/wpa_gui-qt4/icons/wpa_gui.svg
pa_supplicant/wpa_gui-qt4/icons_png.qrc
pa_supplicant/wpa_gui-qt4/lang/.gitignore
pa_supplicant/wpa_gui-qt4/lang/wpa_gui_de.ts
pa_supplicant/wpa_gui-qt4/main.cpp
pa_supplicant/wpa_gui-qt4/networkconfig.cpp
pa_supplicant/wpa_gui-qt4/networkconfig.h
pa_supplicant/wpa_gui-qt4/networkconfig.ui
pa_supplicant/wpa_gui-qt4/peers.cpp
pa_supplicant/wpa_gui-qt4/peers.h
pa_supplicant/wpa_gui-qt4/peers.ui
pa_supplicant/wpa_gui-qt4/scanresults.cpp
pa_supplicant/wpa_gui-qt4/scanresults.h
pa_supplicant/wpa_gui-qt4/scanresults.ui
pa_supplicant/wpa_gui-qt4/stringquery.cpp
pa_supplicant/wpa_gui-qt4/stringquery.h
pa_supplicant/wpa_gui-qt4/userdatarequest.cpp
pa_supplicant/wpa_gui-qt4/userdatarequest.h
pa_supplicant/wpa_gui-qt4/userdatarequest.ui
pa_supplicant/wpa_gui-qt4/wpa_gui.desktop
pa_supplicant/wpa_gui-qt4/wpa_gui.pro
pa_supplicant/wpa_gui-qt4/wpagui.cpp
pa_supplicant/wpa_gui-qt4/wpagui.h
pa_supplicant/wpa_gui-qt4/wpagui.ui
pa_supplicant/wpa_gui-qt4/wpamsg.h
pa_supplicant/wpa_gui/.gitignore
pa_supplicant/wpa_gui/eventhistory.ui
pa_supplicant/wpa_gui/eventhistory.ui.h
pa_supplicant/wpa_gui/main.cpp
pa_supplicant/wpa_gui/networkconfig.ui
pa_supplicant/wpa_gui/networkconfig.ui.h
pa_supplicant/wpa_gui/scanresults.ui
pa_supplicant/wpa_gui/scanresults.ui.h
pa_supplicant/wpa_gui/setup-mingw-cross-compiling
pa_supplicant/wpa_gui/userdatarequest.ui
pa_supplicant/wpa_gui/userdatarequest.ui.h
pa_supplicant/wpa_gui/wpa_gui.pro
pa_supplicant/wpa_gui/wpagui.ui
pa_supplicant/wpa_gui/wpagui.ui.h
pa_supplicant/wpa_gui/wpamsg.h
pa_supplicant/wpa_passphrase.c
pa_supplicant/wpa_priv.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_glue.h
pa_supplicant/wps_supplicant.c
pa_supplicant/wps_supplicant.h
7acd11a82b3521a1ec0ef3976af4786b02642e7e 06-Jan-2011 Android (Google) Code Review <android-gerrit@google.com> Initial empty repository