DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

DPP: Use Transaction ID in Peer Discovery Request/Response frames

Browse source 
DPP tech spec changed the contents of these frames by replacing the
public key hash attributes with a Transaction ID attribute that gets
copied from the request to the response to identify the transaction in a
simpler manner.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-08-23 12:49:22 +03:00 • committed by Jouni Malinen
parent a28675da23
commit 85fd8263a5
4 changed files with 42 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/common/dpp.c
View file

@ -4577,30 +4577,6 @@ fail:
}
static int dpp_netkey_hash(EVP_PKEY *key, u8 *hash)
{
EC_KEY *eckey;
unsigned char *der = NULL;
int ret, der_len;
const u8 *addr[1];
size_t len[1];
eckey = EVP_PKEY_get1_EC_KEY(key);
if (!eckey)
return -1;
EC_KEY_set_conv_form(eckey, POINT_CONVERSION_COMPRESSED);
der_len = i2d_EC_PUBKEY(eckey, &der);
EC_KEY_free(eckey);
if (der_len <= 0)
return -1;
addr[0] = der;
len[0] = der_len;
ret = sha256_vector(1, addr, len, hash);
OPENSSL_free(der);
return ret;
}
int dpp_peer_intro(struct dpp_introduction *intro, const char *own_connector,
const u8 *net_access_key, size_t net_access_key_len,
const u8 *csign_key, size_t csign_key_len,
@ -4753,12 +4729,6 @@ int dpp_peer_intro(struct dpp_introduction *intro, const char *own_connector,
goto fail;
}
if (dpp_netkey_hash(own_key, intro->nk_hash) < 0 ||
dpp_netkey_hash(peer_key, intro->pk_hash) < 0) {
wpa_printf(MSG_ERROR, "DPP: Failed to derive NK/PK hash");
goto fail;
}
ret = 0;
fail:
if (ret < 0)