aboutsummaryrefslogtreecommitdiffstats
path: root/src/common/wpa_common.h
diff options
context:
space:
mode:
authorJouni Malinen <jouni@codeaurora.org>2019-03-17 20:02:06 (GMT)
committerJouni Malinen <j@w1.fi>2019-03-17 23:31:31 (GMT)
commitecacd9ccd45682949f5136ea4f18e131a159846c (patch)
treed3d5ebb370e07dbc4fd72e4b4b37bdf655192374 /src/common/wpa_common.h
parent16a4e931f03e28b221c7c285ff44f7a70163aa0d (diff)
downloadhostap-ecacd9ccd45682949f5136ea4f18e131a159846c.zip
hostap-ecacd9ccd45682949f5136ea4f18e131a159846c.tar.gz
hostap-ecacd9ccd45682949f5136ea4f18e131a159846c.tar.bz2
DPP2: Extend wpa_pmk_to_ptk() to support extra Z.x component in context
DPP allows Diffie-Hellman exchange to be used for PFS in PTK derivation. This requires an additional Z.x (x coordinate of the DH shared secret) to be passed to wpa_pmk_to_ptk(). This commit adds that to the function and updates all the callers to pass NULL,0 for that part in preparation of the DPP specific changes to start using this. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Diffstat (limited to 'src/common/wpa_common.h')
-rw-r--r--src/common/wpa_common.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
index 2d9a715..e83d688 100644
--- a/src/common/wpa_common.h
+++ b/src/common/wpa_common.h
@@ -347,7 +347,8 @@ int wpa_eapol_key_mic(const u8 *key, size_t key_len, int akmp, int ver,
int wpa_pmk_to_ptk(const u8 *pmk, size_t pmk_len, const char *label,
const u8 *addr1, const u8 *addr2,
const u8 *nonce1, const u8 *nonce2,
- struct wpa_ptk *ptk, int akmp, int cipher);
+ struct wpa_ptk *ptk, int akmp, int cipher,
+ const u8 *z, size_t z_len);
int fils_rmsk_to_pmk(int akmp, const u8 *rmsk, size_t rmsk_len,
const u8 *snonce, const u8 *anonce, const u8 *dh_ss,
size_t dh_ss_len, u8 *pmk, size_t *pmk_len);