diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2017-02-14 09:09:30 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2017-02-14 14:33:01 (GMT) |
| commit | 364c064a41f11e1707e3b00e7f5088067313c3ca (patch) | |
| tree | faa67c5ad5523ecb7dd698d21cb0abc1501bbf35 /src/common/wpa_common.h | |
| parent | f229f2c67d370b1d70c1255819ad964918da820c (diff) | |
| download | hostap-364c064a41f11e1707e3b00e7f5088067313c3ca.zip hostap-364c064a41f11e1707e3b00e7f5088067313c3ca.tar.gz hostap-364c064a41f11e1707e3b00e7f5088067313c3ca.tar.bz2 | |
FT: Check key derivation results explicitly in AP operations
Previously, any potential (even if very unlikely) local operation error
was ignored. Now these will result in aborting the negotiation.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'src/common/wpa_common.h')
| -rw-r--r-- | src/common/wpa_common.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h index 4e465f5..a84cc9b 100644 --- a/src/common/wpa_common.h +++ b/src/common/wpa_common.h @@ -358,15 +358,15 @@ int wpa_ft_mic(const u8 *kck, size_t kck_len, const u8 *sta_addr, const u8 *ftie, size_t ftie_len, const u8 *rsnie, size_t rsnie_len, const u8 *ric, size_t ric_len, u8 *mic); -void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len, - const u8 *ssid, size_t ssid_len, - const u8 *mdid, const u8 *r0kh_id, size_t r0kh_id_len, - const u8 *s0kh_id, u8 *pmk_r0, u8 *pmk_r0_name); -void wpa_derive_pmk_r1_name(const u8 *pmk_r0_name, const u8 *r1kh_id, - const u8 *s1kh_id, u8 *pmk_r1_name); -void wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name, - const u8 *r1kh_id, const u8 *s1kh_id, - u8 *pmk_r1, u8 *pmk_r1_name); +int wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len, + const u8 *ssid, size_t ssid_len, + const u8 *mdid, const u8 *r0kh_id, size_t r0kh_id_len, + const u8 *s0kh_id, u8 *pmk_r0, u8 *pmk_r0_name); +int wpa_derive_pmk_r1_name(const u8 *pmk_r0_name, const u8 *r1kh_id, + const u8 *s1kh_id, u8 *pmk_r1_name); +int wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name, + const u8 *r1kh_id, const u8 *s1kh_id, + u8 *pmk_r1, u8 *pmk_r1_name); int wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce, const u8 *sta_addr, const u8 *bssid, const u8 *pmk_r1_name, |