Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-09 08:22:42 +01:00
Code Releases Activity

wscutil: Add M4 builder

Browse Source
This commit is contained in:
Denis Kenzior 2016-08-19 15:24:29 -05:00
parent 5322daa79a
commit 9c457de8d5
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/wscutil.c
View File

@ -1462,6 +1462,20 @@ static void build_rf_bands(struct wsc_attr_builder *builder, uint8_t rf_bands)
wsc_attr_builder_put_u8(builder, rf_bands); wsc_attr_builder_put_u8(builder, rf_bands);
} }
static void build_r_hash1(struct wsc_attr_builder *builder,
const uint8_t *r_hash1)
{
wsc_attr_builder_start_attr(builder, WSC_ATTR_R_HASH1);
wsc_attr_builder_put_bytes(builder, r_hash1, 32);
}
static void build_r_hash2(struct wsc_attr_builder *builder,
const uint8_t *r_hash2)
{
wsc_attr_builder_start_attr(builder, WSC_ATTR_R_HASH2);
wsc_attr_builder_put_bytes(builder, r_hash2, 32);
}
static void build_serial_number(struct wsc_attr_builder *builder, static void build_serial_number(struct wsc_attr_builder *builder,
const char *serial_number) const char *serial_number)
{ {
@ -1650,6 +1664,35 @@ done:
return ret; return ret;
} }
uint8_t *wsc_build_m4(const struct wsc_m4 *m4, const uint8_t *encrypted,
size_t encrypted_len, size_t *out_len)
{
struct wsc_attr_builder *builder;
uint8_t *ret;
builder = wsc_attr_builder_new(256);
build_version(builder, 0x10);
build_message_type(builder, WSC_MESSAGE_TYPE_M4);
build_enrollee_nonce(builder, m4->enrollee_nonce);
build_r_hash1(builder, m4->r_hash1);
build_r_hash2(builder, m4->r_hash2);
wsc_attr_builder_start_attr(builder, WSC_ATTR_ENCRYPTED_SETTINGS);
wsc_attr_builder_put_bytes(builder, encrypted, encrypted_len);
if (!m4->version2)
goto done;
START_WFA_VENDOR_EXTENSION();
done:
build_authenticator(builder, m4->authenticator);
ret = wsc_attr_builder_free(builder, false, out_len);
return ret;
}
bool wsc_uuid_from_addr(const uint8_t addr[], uint8_t *out_uuid) bool wsc_uuid_from_addr(const uint8_t addr[], uint8_t *out_uuid)
{ {
/* Reuse the NSID from WPA Supplicant for compatibility */ /* Reuse the NSID from WPA Supplicant for compatibility */

2
src/wscutil.h
View File

@ -465,5 +465,7 @@ uint8_t *wsc_build_probe_request(const struct wsc_probe_request *probe_request,
uint8_t *wsc_build_m1(const struct wsc_m1 *m1, size_t *out_len); uint8_t *wsc_build_m1(const struct wsc_m1 *m1, size_t *out_len);
uint8_t *wsc_build_m2(const struct wsc_m2 *m2, size_t *out_len); uint8_t *wsc_build_m2(const struct wsc_m2 *m2, size_t *out_len);
uint8_t *wsc_build_m3(const struct wsc_m3 *m3, size_t *out_len); uint8_t *wsc_build_m3(const struct wsc_m3 *m3, size_t *out_len);
uint8_t *wsc_build_m4(const struct wsc_m4 *m4, const uint8_t *encrypted,
size_t encrypted_len, size_t *out_len);
bool wsc_uuid_from_addr(const uint8_t addr[], uint8_t *out_uuid); bool wsc_uuid_from_addr(const uint8_t addr[], uint8_t *out_uuid);