aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix security vulnerability wpa_supplicant/wnm_sta.c:376lineage-15.1Hai Shalom2019-05-081-0/+4
| | | | | | | | | | | | Fix Security Vulnerability - Security Report - [Out of bounds read in wnm_parse_neighbor_report_elem in external/wpa_supplicant_8/wpa_supplicant/wnm_sta.c:376] Bug: 122074159 Test: Connect to AP, run traffic Test: Run poc_wnm_sta_376 on device, comfirm new error message appears Change-Id: If0ff673d2536135469144ee69b3f4e1831be73bf (cherry picked from commit cb95c3f41acb3bcdd6477b59f945554bc1849465) (cherry picked from commit 5e6e3f710fd8f317f479fc9b7a5bfed1bef89f9f)
* Use BoringSSL to get random bytesRich Cannings2019-02-052-0/+8
| | | | | | | Bug: 117508900 Change-Id: I4889513c0671ff2b689f1beca8084d6f149d473d Test: Existing tests pass (cherry picked from commit ac1636ce54fe6e50786c251fd33e39a46a2a9499)
* WNM: Fix WNM-Sleep Mode Request bounds checkingJouni Malinen2019-01-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ieee802_11_rx_wnmsleep_req() might be called for a short frame that has no more payload after the Public Action field, i.e., with len == 0. The bounds checking for the payload length was done only for the information elements while the one octet Dialog Token field was read unconditionally. This could result in reading one octet beyond the end of the received frame data. Depending on driver interface specific mechanism used for fetching the frame, this could result in reading one octet beyond the end of a stack/hash buffer or reading an uninitialized octet from within a buffer. The actual value that was read as the Dialog Token field is not used since the function returns immediately after having read this value when there is no information elements following the field. This issue was initially added in commit d32d94dbf47a ("WNM: Add WNM-Sleep Mode implementation for AP") (with CONFIG_IEEE80211V=y build option) and it remained in place during number of cleanup and fix changes in this area and renaming of the build parameter to CONFIG_WNM=y. The impacted function was not included in any default build without one of the these optional build options being explicitly enabled. CONFIG_WNM=y is still documented as "experimental and not complete implementation" in hostapd/defconfig. In addition, commit 114f2830d2c2 ("WNM: Ignore WNM-Sleep Mode Request in wnm_sleep_mode=0 case") made this function exit before the impact read if WNM-Sleep Mode support was not explicitly enabled in runtime configuration (wnm_sleep_mode=1 in hostapd.conf). Fix this by explicitly checking the frame has enough payload before reading the Dialog Token field. Bug: 111893132 Change-Id: I4b61e22c39d1a5683923eff34e43bb0c509913d4 Merged-In: I4b61e22c39d1a5683923eff34e43bb0c509913d4 Signed-off-by: Jouni Malinen <jouni@codeaurora.org> (cherry picked from commit 7a543744db8ece2376b019040b5668ede68ebd8b)
* Snap for 4417144 from 38dc82fc807a28f3a27b82a66b6f701db1eb5d58 to oc-m2-releaseandroid-build-team Robot2017-10-260-0/+0
|\ | | | | | | Change-Id: I837dcff43bdcc42bccd8630ce70045b1605c77d0
| * Snap for 4404534 from 9a053f7d10503860b54e6164149a07affed552ce to oc-mr1-releaseandroid-build-team Robot2017-10-190-0/+0
| |\ | | | | | | | | | Change-Id: I262ed6b0b938a45be9671b10d74beb67d460f5d2
| | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours am: bc65f8bbcd -s ours am: 172514b925 -s ours am: 44a284a72c -s ours am: 32821e9555 -s ours am: bef32b9df8 -s ours am: 30e2e16362 -s ours am: ac54a0ad05 -s ours Change-Id: I8f88aaac9fab3363cf5537e39721f7fd30b070ba
| | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours am: bc65f8bbcd -s ours am: 172514b925 -s ours am: 44a284a72c -s ours am: 32821e9555 -s ours am: bef32b9df8 -s ours am: 30e2e16362 -s ours Change-Id: Iec1b67ab6923363cb534c96b4c1fc992ded993f3
| | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours am: bc65f8bbcd -s ours am: 172514b925 -s ours am: 44a284a72c -s ours am: 32821e9555 -s ours am: bef32b9df8 -s ours Change-Id: I2cb28a4afff92b2d61362e5a46c8228f1d6bbc37
| | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours am: bc65f8bbcd -s ours am: 172514b925 -s ours am: 44a284a72c -s ours am: 32821e9555 -s ours Change-Id: I10b5ce950fb94f8d18a7e134f144aaa2e958c3e3
| | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours am: bc65f8bbcd -s ours am: 172514b925 -s ours am: 44a284a72c -s ours Change-Id: Ibdda0adb66ce56a2acedcd11413eec00c3574ba4
| | | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours am: bc65f8bbcd -s ours am: 172514b925 -s ours Change-Id: I967e62f6dd49ad85bb9b86de7dba414a59ca5175
| | | | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours am: bc65f8bbcd -s ours Change-Id: Ife82013f92ec6002c72fbc3b21464dacc3b4ab42
| | | | | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours am: 6040f222ef -s ours Change-Id: Ie42da40037b24ef80afdc056759d57834b22a537
| | | | | | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours am: 6c23d5e07f -s ours Change-Id: I622a78eee0a749e6db4e37f3cc5e5632d8822b4c
| | | | | | | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s ours ↵Jouni Malinen2017-10-180-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours am: 1726f2febb -s ours Change-Id: I8a0b9c6963249f8fd158f3c430492c9f04ad8f01
| | | | | | | | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9 -s oursJouni Malinen2017-10-180-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fe3833897 -s ours Change-Id: Icd737c1be77a1ccbc7945743f435c0cae419ff8d
| | | | | | | | | | | | | * TDLS: Reject TPK-TK reconfiguration am: 4c52740a9bJouni Malinen2017-10-180-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: af26b03ad9 -s ours Change-Id: Id582b92f4c9a999ee5673552ee4adfa0b2d74deb
| | | | | | | | | | | | | | * TDLS: Reject TPK-TK reconfigurationJouni Malinen2017-10-121-2/+36
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4c52740a9b Change-Id: Ia2221f776ade171d76c14caf8a8ecd303140754e
| | | | | | | | | | | | | | | * TDLS: Reject TPK-TK reconfigurationJouni Malinen2017-10-101-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to reconfigure the same TPK-TK to the driver after it has been successfully configured. This is an explicit check to avoid issues related to resetting the TX/RX packet number. There was already a check for this for TPK M2 (retries of that message are ignored completely), so that behavior does not get modified. For TPK M3, the TPK-TK could have been reconfigured, but that was followed by immediate teardown of the link due to an issue in updating the STA entry. Furthermore, for TDLS with any real security (i.e., ignoring open/WEP), the TPK message exchange is protected on the AP path and simple replay attacks are not feasible. As an additional corner case, make sure the local nonce gets updated if the peer uses a very unlikely "random nonce" of all zeros. Bug: 65245581 Test: Wifi Integration Suite Merged-In: Ic94024e8a3bf8f24c77224b4960315b5f8512fc1 Change-Id: Ic94024e8a3bf8f24c77224b4960315b5f8512fc1 Signed-off-by: Jouni Malinen <j@w1.fi> Signed-off-by: Glen Kuhne <kuh@google.com>
| | * | | | | | | | | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours am: 8c823b85d4 -s ours am: 560656c55d -s ours am: bda468a550 -s ours am: 6c569d77ba -s ours am: 74b13d81d9 -s ours am: 01f2b4989e -s ours am: cd0372c37e -s ours Change-Id: I8fcd61cc3ecef7a50d94d585e39e4657be9237bd
| | | * | | | | | | | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours am: 8c823b85d4 -s ours am: 560656c55d -s ours am: bda468a550 -s ours am: 6c569d77ba -s ours am: 74b13d81d9 -s ours am: 01f2b4989e -s ours Change-Id: I7a5f101450365693c7f6993bf113369366c16a28
| | | | * | | | | | | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours am: 8c823b85d4 -s ours am: 560656c55d -s ours am: bda468a550 -s ours am: 6c569d77ba -s ours am: 74b13d81d9 -s ours Change-Id: I43024183918430df9aa978d5ed516bea046464ff
| | | | | * | | | | | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours am: 8c823b85d4 -s ours am: 560656c55d -s ours am: bda468a550 -s ours am: 6c569d77ba -s ours Change-Id: Ib1cff3abca1e472fbe6293d39d1a286989cad863
| | | | | | * | | | | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours am: 8c823b85d4 -s ours am: 560656c55d -s ours am: bda468a550 -s ours Change-Id: I019454860455473f68801624955ccb7e2ae098bf
| | | | | | | * | | | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours am: 8c823b85d4 -s ours am: 560656c55d -s ours Change-Id: I7b93787388014363a7c97455bbbedfc5c60331e7
| | | | | | | | * | | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours am: 8c823b85d4 -s ours Change-Id: I5f48ee448d8f23e8203fec0af0eb5c025445a6e6
| | | | | | | | | * | | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f am: a500c33ebd -s ours Change-Id: Id2e068d7592dc60192bf02b4877037ff92ab2cf2
| | | | | | | | | | * | | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-190-0/+0
| | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad am: e4ce9cad5f Change-Id: I33b2af55d0d63b9cfe892de4c2d0ea10529e6237
| | | | | | | | | | | * | | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: ↵Arik Nemtsov2017-10-180-0/+0
| | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 349a4f0ca5 am: fbbe76a3ea am: b637148cad Change-Id: I47fa48c724b0789d4612b00d5dfe1c8c1ee0ec98
| | | | | | | | | | | | * | | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7 am: 349a4f0ca5Arik Nemtsov2017-10-180-0/+0
| | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fbbe76a3ea Change-Id: Ia799d7d962ee5e0d3644fbf7e1d3ab430ac63ca7
| | | | | | | | | | | | | * | | TDLS: Ignore incoming TDLS Setup Response retries am: a7baabbbe7Arik Nemtsov2017-10-180-0/+0
| | | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 349a4f0ca5 Change-Id: I7d1982c45c1ebccf8fb079912a79543fed96c6dc
| | | | | | | | | | | | | | * | TDLS: Ignore incoming TDLS Setup Response retriesArik Nemtsov2017-10-121-0/+8
| | | | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7baabbbe7 Change-Id: Ic6ac2d6ab9fec1b55e60e6abba8ad8d419308204
| | | | | | | | | | | | | | | * TDLS: Ignore incoming TDLS Setup Response retriesArik Nemtsov2017-10-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Setup Response timer is relatively fast (500 ms) and there are instances where it fires on the responder side after the initiator has already sent out the TDLS Setup Confirm frame. Prevent the processing of this stale TDLS Setup Response frame on the initiator side. Bug: 65245581 Test: Wifi Integration Suite Merged-In: I0fadef8993a548d64a4280372bc105fefa11e62a Change-Id: I404ab3d3bb864d72c6189890d1d63d7b893f3f9e Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com> Signed-off-by: Glen Kuhne <kuh@google.com>
| | * | | | | | | | | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours am: 2fc627faae -s ours am: 72f303c62b -s ours am: e24998d0ec -s ours am: 37dbf4894d -s ours am: 758ed7d4e7 -s ours am: 7e8bf5031c -s ours am: f2f9856721 -s ours Change-Id: I35a0ecc5a72074ba387494e074017dc54ed686cf
| | | * | | | | | | | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours am: 2fc627faae -s ours am: 72f303c62b -s ours am: e24998d0ec -s ours am: 37dbf4894d -s ours am: 758ed7d4e7 -s ours am: 7e8bf5031c -s ours Change-Id: I6533f7c5fb186cc7c0b51480ba14c1341e7817d0
| | | | * | | | | | | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours am: 2fc627faae -s ours am: 72f303c62b -s ours am: e24998d0ec -s ours am: 37dbf4894d -s ours am: 758ed7d4e7 -s ours Change-Id: Icf37fa2fa6d9b26fc2b7edc2ac54d56416038db0
| | | | | * | | | | | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours am: 2fc627faae -s ours am: 72f303c62b -s ours am: e24998d0ec -s ours am: 37dbf4894d -s ours Change-Id: I3cde97e811c60efbb4d17e9203af2333892e146b
| | | | | | * | | | | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours am: 2fc627faae -s ours am: 72f303c62b -s ours am: e24998d0ec -s ours Change-Id: Icf7fd5cc6ca8956528e8d0f3a28eeb9e5284c952
| | | | | | | * | | | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours am: 2fc627faae -s ours am: 72f303c62b -s ours Change-Id: I141aa872342ec6a0058cddd6fde949d0f4dddfa1
| | | | | | | | * | | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours am: 2fc627faae -s ours Change-Id: I251d477907add6171dc309cf3392d60f7ddfefc5
| | | | | | | | | * | | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours am: 9e44f88253 -s ours Change-Id: I71fdb85a0eb7b8fff69c7613af8394bf03dc367e
| | | | | | | | | | * | | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-190-0/+0
| | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours am: a1a392bfd4 -s ours Change-Id: I21e6cb42dd1ddc236a094a91f5a30b6cb298bdf8
| | | | | | | | | | | * | | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s ↵Jouni Malinen2017-10-180-0/+0
| | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 36dc61025b -s ours am: 66cf8e0f1e -s ours Change-Id: I658a75d03ece32ccf4c43a8561737bcebdc2b914
| | | | | | | | | | | | * | | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e -s oursJouni Malinen2017-10-180-0/+0
| | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 36dc61025b -s ours Change-Id: Idc09c1528a147529b6f00a0b43596b18539c7d74
| | | | | | | | | | | | | * | | Fix PTK rekeying to generate a new ANonce am: e52ae8e63aJouni Malinen2017-10-180-0/+0
| | | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a1f3ac5a6e -s ours Change-Id: I056d56d67babd7bf8d0a68c9cc65668a566b2333
| | | | | | | | | | | | | | * | Fix PTK rekeying to generate a new ANonceJouni Malinen2017-10-121-3/+21
| | | | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e52ae8e63a Change-Id: Icde8c1667c866274cb59a7c5504506607189abe7
| | | | | | | | | | | | | | | * Fix PTK rekeying to generate a new ANonceJouni Malinen2017-10-101-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Authenticator state machine path for PTK rekeying ended up bypassing the AUTHENTICATION2 state where a new ANonce is generated when going directly to the PTKSTART state since there is no need to try to determine the PMK again in such a case. This is far from ideal since the new PTK would depend on a new nonce only from the supplicant. Fix this by generating a new ANonce when moving to the PTKSTART state for the purpose of starting new 4-way handshake to rekey PTK. Bug: 65245581 Test: Wifi Integration Suite Merged-In: Ib1276336b08af19f664d1562e2844f969774bb1c Change-Id: Ib1276336b08af19f664d1562e2844f969774bb1c Signed-off-by: Jouni Malinen <j@w1.fi> Signed-off-by: Glen Kuhne <kuh@google.com>
| | * | | | | | | | | | | | | | Extend protection of GTK/IGTK reinstallation of WNM-Sleep Mode cases am: ↵Jouni Malinen2017-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af1b1a2118 am: 83b7bd2ef9 -s ours am: 8b76702941 -s ours am: 53ab24a09b -s ours am: ef522b708c -s ours am: d8b0597517 -s ours am: a604476d76 -s ours am: fd7702d085 -s ours am: 2a09ba6a5c -s ours am: 5fc2323333 -s ours am: 4b5a5819bc -s ours am: 7126b64a4a -s ours am: a4e862b3ee -s ours Change-Id: I4db6423543c45668e7f72a0d4a4e71135e542985
| | | * | | | | | | | | | | | | Extend protection of GTK/IGTK reinstallation of WNM-Sleep Mode cases am: ↵Jouni Malinen2017-10-190-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af1b1a2118 am: 83b7bd2ef9 -s ours am: 8b76702941 -s ours am: 53ab24a09b -s ours am: ef522b708c -s ours am: d8b0597517 -s ours am: a604476d76 -s ours am: fd7702d085 -s ours am: 2a09ba6a5c -s ours am: 5fc2323333 -s ours am: 4b5a5819bc -s ours am: 7126b64a4a -s ours Change-Id: I666402efce82b94440be806c1b04b023f939bc12
| | | | * | | | | | | | | | | | Extend protection of GTK/IGTK reinstallation of WNM-Sleep Mode cases am: ↵Jouni Malinen2017-10-190-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af1b1a2118 am: 83b7bd2ef9 -s ours am: 8b76702941 -s ours am: 53ab24a09b -s ours am: ef522b708c -s ours am: d8b0597517 -s ours am: a604476d76 -s ours am: fd7702d085 -s ours am: 2a09ba6a5c -s ours am: 5fc2323333 -s ours am: 4b5a5819bc -s ours Change-Id: I6c00aa646ce4bde18b18c52bad7cb37baf54b738