jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

DPP: Explicitly delete the PKEX secret element K upon generation of z

Browse source 
This was added as an explicit requirement in DPP tech spec 0.2.3.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-10-10 00:56:21 +03:00 committed by Jouni Malinen
parent 0e6709a4ea
commit 6254045a51
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/common/dpp.c
View file

@ -5380,6 +5380,7 @@ struct wpabuf * dpp_pkex_rx_exchange_resp(struct dpp_pkex *pkex,
size_t len[4]; size_t len[4];
u8 u[DPP_MAX_HASH_LEN]; u8 u[DPP_MAX_HASH_LEN];
u8 octet; u8 octet;
int res;
attr_status = dpp_get_attr(buf, buflen, DPP_ATTR_STATUS, attr_status = dpp_get_attr(buf, buflen, DPP_ATTR_STATUS,
&attr_status_len); &attr_status_len);
@ -5505,10 +5506,13 @@ struct wpabuf * dpp_pkex_rx_exchange_resp(struct dpp_pkex *pkex,
/* z = HKDF(<>, MAC-Initiator | MAC-Responder | M.x | N.x | code, K.x) /* z = HKDF(<>, MAC-Initiator | MAC-Responder | M.x | N.x | code, K.x)
*/ */
if (dpp_pkex_derive_z(pkex->own_mac, pkex->peer_mac, res = dpp_pkex_derive_z(pkex->own_mac, pkex->peer_mac,
pkex->Mx, curve->prime_len, pkex->Mx, curve->prime_len,
attr_key /* N.x */, attr_key_len / 2, pkex->code, attr_key /* N.x */, attr_key_len / 2,
Kx, Kx_len, pkex->z, curve->hash_len) < 0) pkex->code, Kx, Kx_len,
pkex->z, curve->hash_len);
os_memset(Kx, 0, Kx_len);
if (res < 0)
goto fail; goto fail;
/* {A, u, [bootstrapping info]}z */ /* {A, u, [bootstrapping info]}z */
@ -5589,6 +5593,7 @@ struct wpabuf * dpp_pkex_rx_commit_reveal_req(struct dpp_pkex *pkex,
size_t clear_len; size_t clear_len;
struct wpabuf *clear = NULL; struct wpabuf *clear = NULL;
u8 *wrapped; u8 *wrapped;
int res;
/* K = y * X' */ /* K = y * X' */
ctx = EVP_PKEY_CTX_new(pkex->y, NULL); ctx = EVP_PKEY_CTX_new(pkex->y, NULL);
@ -5609,10 +5614,12 @@ struct wpabuf * dpp_pkex_rx_commit_reveal_req(struct dpp_pkex *pkex,
/* z = HKDF(<>, MAC-Initiator | MAC-Responder | M.x | N.x | code, K.x) /* z = HKDF(<>, MAC-Initiator | MAC-Responder | M.x | N.x | code, K.x)
*/ */
if (dpp_pkex_derive_z(pkex->peer_mac, pkex->own_mac, res = dpp_pkex_derive_z(pkex->peer_mac, pkex->own_mac,
pkex->Mx, curve->prime_len, pkex->Mx, curve->prime_len,
pkex->Nx, curve->prime_len, pkex->code, pkex->Nx, curve->prime_len, pkex->code,
Kx, Kx_len, pkex->z, curve->hash_len) < 0) Kx, Kx_len, pkex->z, curve->hash_len);
os_memset(Kx, 0, Kx_len);
if (res < 0)
goto fail; goto fail;
wrapped_data = dpp_get_attr(buf, buflen, DPP_ATTR_WRAPPED_DATA, wrapped_data = dpp_get_attr(buf, buflen, DPP_ATTR_WRAPPED_DATA,