aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/wpa_supplicant_8"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-20[LSC] Add LOCAL_LICENSE_KINDS to external/wpa_supplicant_8Bob Badour
Added SPDX-license-identifier-BSD to: Android.bp wpa_supplicant/hidl/1.4/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I075c77ba047b4defcc068413f3731e5871a26ca6
2021-10-15Merge "Prepares wpa_supplicant for use by a wifi HAL vendor APEX."Daniel Norman
2021-10-13Prepares wpa_supplicant for use by a wifi HAL vendor APEX.Daniel Norman
- Allows wpa_supplicant HIDL to read from an APEX for config files. - Creates a cc_defaults with soong config vars for wpa_supplicant that customized implementations can override. Bug: 201817549 Test: Build a wifi hal vendor APEX on Cuttlefish. Test: Connect to wifi; atest CtsWifiTestCases Change-Id: I92f98bb61a67724674374279f6c7a8233a7b8559
2021-10-07Merge "Merge Android 12"Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I264384190bf2ef047afc6503538fd4496597ba33 Change-Id: Iafe413e785b4d380bf3129442d4358530832032f
2021-09-30Merge "Fix wpa_supplicant build with newer BoringSSL" am: 96e84352e6temp_sam_202323961Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1835013 Change-Id: I264384190bf2ef047afc6503538fd4496597ba33
2021-09-30Merge "Fix wpa_supplicant build with newer BoringSSL"Treehugger Robot
2021-09-23Fix wpa_supplicant build with newer BoringSSLDavid Benjamin
Like OpenSSL, reaching into BoringSSL's internal structs is not supported and we're enforcing this by hiding the structs. This matches the corresponding changes in OpenSSL 1.1.x. It looks like wpa_supplicant has some custom BoringSSL-only reimplementation of OCSP. Fix that to use public APIs. Note this change does not audit the file for correctness, only fixes compile errors. The change does the following: 1. Switch ASN1_STRING_data to ASN1_STRING_get0_data. This is not strictly necessary, but uses the slightly more const-correct API. 2. Heap-allocate X509_STORE_CTX. Matching OpenSSL 1.1.x, the type is now opaque and must use the new/free functions. 3. Don't reach into internal ex_flags and ex_xkusage fields. The old wpa_supplicant was relying on X509_check_purpose filling in the internal cached fields as a side effect. Instead, use the public API, which does not need the side effect. This file should be rewritten with CBS/CBB, or removed altogether, but for now just fix the build. Test: mm Change-Id: I27d7b79e333260f27b75dda6caef0c25dd838c6b
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
Merged-In: Ice4803cf91173f070b97bbbfaf8c8929a174fa5a Change-Id: I010975095b0ed9c1436d971569318b8d45838cdd
2021-08-06keystore: Fix PEM certs handling am: 7ad2a87249Hai Shalom
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15433405 Change-Id: Ice4803cf91173f070b97bbbfaf8c8929a174fa5a
2021-08-06keystore: Fix PEM certs handlingandroid12-devHai Shalom
Remove the DER encoding processing since keystore is guaranteed to provide PEM encoded certificates. Clean up hard-coded strings/values, and use better variable names. Bug: 190223327 Test: Connect to enterprise networks using EAP-TTLS and EAP-TLS to verify that both Root CA and client certificates are parsed correctly, and verify logs. Test: Regression test passed (b/195536535) Change-Id: I79ca980599fa753392b5192e9d5872d435c815b0
2021-06-30Update GO operating frequency after interface setup is completed. am: 236f0f571dSunil Ravi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15139488 Change-Id: I2b2143b9f6ebb2ef2a1ad14011fa45fbdf1d4b45
2021-06-29Update GO operating frequency after interface setup is completed.Sunil Ravi
Once the GO/AP interface initialization is completed, check if the operating frequency set in wpa_supplicant group interface structure is different than the one set in hostapd interface structure associated with the group interface. If yes, update frequency in wpa_supplicant group interface and Network configuration to the frequency set in hostapd interface structure. The frequency set in hostapd interface is the correct/final frequency supplicant configured in kernel/driver. This is done because supplicant may switch the initially requested primary and seconday frequencies to get secondary frequency with no beacons (To avoid interference or 20/40 coex logic). And the updated frequency is informed by driver only after the interface setup is completed through channel switch event - EVENT_CH_SWITCH. But supplicant update the frequency to applications through P2P_GROUP_STARTED event which is triggered before EVENT_CH_SWITCH event. To send the correct frequency to applications the frequency must be updated before sending P2P_GROUP_STARTED event. Bug: 191272346 Test: Manual - Verified that GO frequency is updated and reported correctly to Nearby application. Change-Id: I70910365b8acebfbefdd853e7a6cd3f9f6ec6a5c
2021-06-22Added changes to handle Legacy FT test cases. am: eaaf04ea4fMir Ali
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15066394 Change-Id: I5b1e9187a4112c8a44e003e43772e6b5be5b8348
2021-06-22Added changes to handle Legacy FT test cases.Mir Ali
1. Current checks included only SAE_FT AKM for state machine handling.Added additional checks for legacy FT AKM's. 2. As part of GTK rekey, the keys generated in the DHD post FT roam should be updated to the supplicant. Added support for private command to fetch these keys Bug: 187705876 Test: Validated on Android S slider Signed-off-by: Mir Ali <mir-khizer.ali@broadcom.com> Change-Id: I84499c1692538593b50b15cd53a7a9fd770f4f0c
2021-06-22Merge "Use a shorter wait time for p2p connect with operating frequency" ↵TreeHugger Robot
into sc-dev am: ca924c1648 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15057013 Change-Id: I7ca5aaf074bf3b7f6c3a1c8b84513cda90d4c43c
2021-06-22Merge "Use a shorter wait time for p2p connect with operating frequency" ↵TreeHugger Robot
into sc-dev
2021-06-21Use a shorter wait time for p2p connect with operating frequencySunil Ravi
If supplicant is receiving the connect request with GO operating frequency, then application(caller) must be already knowing and sure that GO is operating on that frequency. So if the GO is not seen in the first scan attempt, it is not worth waiting for 1 second to trigger the next scan. It's better to finish scans quickly and report the Join failure to application. This will help applications to trigger another Join attempt with a band information or without band or frequency information. To speed up the scan, reduced the scan interval for single channel scan from 1 sec to 200 milli seconds. Bug: 191718156 Test: Manual - Triggered P2P join request with channel, band, no channel/band and verified the scan times. Change-Id: I44e22f8e3a4d7460466b3e102f2d0c92038914d1
2021-06-21[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: ↵Xin Li
0c976e03e0 -s ours am: 2d52b3e57e -s ours am skip reason: Merged-In I74e74c6195c0df8979f418afd0e1e7c2b5d9109a with SHA-1 0b81e182cf is already in history Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1741479 Change-Id: I38722411b143b6755b9cbdb20aaa74d4ab6953b1
2021-06-21[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: ↵Xin Li
0c976e03e0 -s ours am skip reason: Merged-In I74e74c6195c0df8979f418afd0e1e7c2b5d9109a with SHA-1 0b81e182cf is already in history Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1741479 Change-Id: I703551e42c459556b21afb74b0f0fe94b1240dda
2021-06-21Merge "DO NOT MERGE - Merge RQ3A.210605.005"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
2021-06-18DO NOT MERGE - Merge RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: I74e74c6195c0df8979f418afd0e1e7c2b5d9109a Change-Id: Ia5ae7cf2ce175cac2995017727240875ca32ad18
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
0b81e182cf -s ours am skip reason: Merged-In I0e4872271bad8c0417c90268661eb7750f0fde01 with SHA-1 561c74d4bd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15017806 Change-Id: I3efdbf81c2c7320354ec1a4e1d008baa2247ef0c
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: I0e4872271bad8c0417c90268661eb7750f0fde01 Change-Id: I74e74c6195c0df8979f418afd0e1e7c2b5d9109a
2021-06-18[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 561c74d4bd -s oursXin Li
am skip reason: Merged-In Iba09c7e223061f452a0be23c2173792c78bf7205 with SHA-1 b8acd2a860 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14972152 Change-Id: Ibe490661f72fc8873754518ffbb831aa77f70e5b
2021-06-17DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Merged-In: Iba09c7e223061f452a0be23c2173792c78bf7205 Change-Id: I0e4872271bad8c0417c90268661eb7750f0fde01
2021-06-17Merge "Fix for dropping p2p group remove event in HIDL" into sc-dev am: ↵Sunil Ravi
fac34aee1d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15005119 Change-Id: I08448408530786b4c29df0ba68680f35aa5fe19e
2021-06-17Merge "Fix for dropping p2p group remove event in HIDL" into sc-devSunil Ravi
2021-06-16Fix for dropping p2p group remove event in HIDLSunil Ravi
On implemetations where p2p device interface's parent is sta interface(wlan0), p2p supplicant HIDL fails to find the p2p device interface to notify the p2p group event. This happens when p2p client fails to find the auto GO to connect. In this particular case p2p group interface is not created. So supplicant HIDL calls wpas_notify_p2p_group_removed() by passing p2p device interface. Function getTargetP2pIfaceForGroup() which finds the device interface is not taking care of the implementations where p2p device interface is created under wlan0 interface. So to fix this issue added a case to check if received interface is a p2p device interface. Bug: 191155391 Test: Manual - Triggered p2p connect failure and confirmed that p2p group removed event is sent to framework. Change-Id: I6fb6bbb89a329d2fb641dfcbcc6f128e3827a3b0
2021-06-15WiFi: Modify OWNERS files am: a9478a90f9Ahmed ElArabawy
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14984553 Change-Id: Icec2540632cc87aa3575f1ecc547edb99105a15f
2021-06-15WiFi: Modify OWNERS filesAhmed ElArabawy
Replace kumaranand@ with arabawy@ in OWNERS files Bug: 191158491 Test: None Change-Id: Ib1fec05b55c8ae2cf29c44d49530c684e97840a8
2021-06-11Decouple btm_offload feature from MBO feature am: 84bb3e1228Sunil Ravi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14937871 Change-Id: Ibb57f10faa7c088a138b52d67d4380ab686ee0b8
2021-06-10Decouple btm_offload feature from MBO featureSunil Ravi
btm_offload feature is not tied to MBO feature. So if btm_offload feature is enabled, skip the roaming algorithm even if there are no MBO IEs in BTM frame. Bug: 190231636 Test: Manual - Roaming test Change-Id: Ib6e76ca11e93f0fff74ed5bd836346b1e1446a5f
2021-06-08P2P: Try fast associate if p2p GO is found in external scan am: b3986b859dSunil Ravi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14782089 Change-Id: Ifa293371592a64a36d681868ea109b17346ab8c6
2021-06-04P2P: Try fast associate if p2p GO is found in external scanSunil Ravi
Before supplicant issues a scan to driver, check if p2p GO was found in external scan. If yes, try to do a fast associate. Bug:187543099 Test: Manual-File transfer using Nearby APP and check the connection latency. Change-Id: Idf91d51c08023c4b7a09484cfcce1d271f032589
2021-06-01HIDL: set he_oper_chwidth=1 to allow 80Mhz bandwidth. am: 33dcaa5b0dPurushottam Kushwaha
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14735895 Change-Id: I151d0b72f5ac4b105fb6d2c44fd8d896ce67b3ff
2021-05-31HIDL: set he_oper_chwidth=1 to allow 80Mhz bandwidth.Purushottam Kushwaha
For targets where CONFIG_IEEE80211AX is enabled, 80/160/80+80 bandwidth is decided based on he_oper_chwidth. This commit is to enable 80MHz by default. Bug: 189297518 Test: Manual - Turn on Hotspot and check BW settings in logs Change-Id: If76030681e71014f9df073e9c28ec43a6d6a75b2 Signed-off-by: Purushottam Kushwaha <quic_pkushwah@quicinc.com>
2021-05-08[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ↵Xin Li
am: 70cf7b1a4b -s ours am: 6f668cc08d -s ours am: 79b3c1bed7 -s ours am: cdee209b47 -s ours am skip reason: Merged-In I362a580824bf8feea87ea4ed2895af279b3fbc36 with SHA-1 5697f3dc40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1699956 Change-Id: I054975dd126b15dd876afaafc6e5c009ce4a473e
2021-05-08[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ↵Xin Li
am: 70cf7b1a4b -s ours am: 6f668cc08d -s ours am: 79b3c1bed7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1699956 Change-Id: I8551a032be19c11f18cacea4df4d79c7f0306ea8
2021-05-08[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ↵Xin Li
am: 70cf7b1a4b -s ours am: 6f668cc08d -s ours am skip reason: Merged-In I362a580824bf8feea87ea4ed2895af279b3fbc36 with SHA-1 5697f3dc40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1699956 Change-Id: I761a23aebf90e04b600eb917112b390a0dc75705
2021-05-08[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ↵Xin Li
am: 70cf7b1a4b -s ours am skip reason: Merged-In I362a580824bf8feea87ea4ed2895af279b3fbc36 with SHA-1 5697f3dc40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1699956 Change-Id: Ie3178133719ba40a0769186d5e2c4b86b6314944
2021-05-08Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged."android-s-beta-2android-s-beta-1Xin Li
2021-05-07DO NOT MERGE - Mark RQ2A.210105.001 as merged.Xin Li
Bug: 180401296 Merged-In: I362a580824bf8feea87ea4ed2895af279b3fbc36 Change-Id: Ib684ac390a44dd95cc96f8a112e82b2876c352bd
2021-05-06optimize the p2p client scan time am: 26978f3555Sunil Ravi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14392092 Change-Id: I5172ed3aa7235589888c592ca2d6b952ccaa33f8
2021-05-05optimize the p2p client scan timeSunil Ravi
1. Reduced the total number of scans to find an auto GO from 10 to 3. 2. Optimized the overall scan duration for band scan, ie, a. In the first two scans, include all the channels except DFS channels. c. In the third attempt, include all the channels. 3. When framework gives a specific frequency to connect, no need to check if the frequency is allowed for p2p operation. Instead check the frequency is allowed as per the regulatory. If the channel is not allowed to operate, return failure to application. This is to allow devices to scan passive channel and connect(GO takes the master responsibilities). Bug: 186675298 Test: File transfer using nearby APP Change-Id: Icf3494d4c655d85ce9f67e4f90632022303a7e75
2021-05-03wifi: enfoce H2E for 6Ghz BSS am: aace8cd0feJimmy Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/14161051 Change-Id: I2bdf582633c6dba133e1fed606858c73492473bf
2021-05-03wifi: enfoce H2E for 6Ghz BSSJimmy Chen
Bug: 167634062 Test: atest VtsHalWifiSupplicantV1_4TargetTest Change-Id: I83a46c299d69c71e0595bb30ef93193bf58fe813
2021-04-14Merge "optimize p2p scan time in finding auto GO" into sc-devSunil Ravi
2021-04-13optimize p2p scan time in finding auto GOSunil Ravi
When populating the scan params frequency list, get the channel list from p2p supported channels instead of getting all the channels corresponding to a band. Bug: 185079998 Test: Manual - Establish P2P connection Change-Id: I922621ce7eab3ac7630c322d3ef70e7181700947