Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-20 12:39:25 +01:00
Code Releases Activity

wscutil: Add builder for M2 messages

Browse Source
This commit is contained in:
Denis Kenzior 2016-08-17 22:12:46 -05:00
parent ea8fddb897
commit f11868d59d
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/wscutil.c
View File

@ -1209,6 +1209,13 @@ static void build_authentication_type_flags(struct wsc_attr_builder *builder,
wsc_attr_builder_put_u16(builder, auth_type_flags);
}
static void build_authenticator(struct wsc_attr_builder *builder,
const uint8_t *authenticator)
{
wsc_attr_builder_start_attr(builder, WSC_ATTR_AUTHENTICATOR);
wsc_attr_builder_put_bytes(builder, authenticator, 8);
}
static void build_configuration_error(struct wsc_attr_builder *builder,
enum wsc_configuration_error error)
{
@ -1317,6 +1324,13 @@ static void build_public_key(struct wsc_attr_builder *builder,
wsc_attr_builder_put_bytes(builder, public_key, 192);
}
static void build_registrar_nonce(struct wsc_attr_builder *builder,
const uint8_t *nonce)
{
wsc_attr_builder_start_attr(builder, WSC_ATTR_REGISTRAR_NONCE);
wsc_attr_builder_put_bytes(builder, nonce, 16);
}
static void build_request_type(struct wsc_attr_builder *builder,
enum wsc_request_type type)
{
@ -1343,6 +1357,12 @@ static void build_uuid_e(struct wsc_attr_builder *builder, const uint8_t *uuid)
wsc_attr_builder_put_bytes(builder, uuid, 16);
}
static void build_uuid_r(struct wsc_attr_builder *builder, const uint8_t *uuid)
{
wsc_attr_builder_start_attr(builder, WSC_ATTR_UUID_R);
wsc_attr_builder_put_bytes(builder, uuid, 16);
}
static void build_version(struct wsc_attr_builder *builder, uint8_t version)
{
wsc_attr_builder_start_attr(builder, WSC_ATTR_VERSION);
@ -1451,6 +1471,52 @@ done:
return ret;
}
uint8_t *wsc_build_m2(const struct wsc_m2 *m2, size_t *out_len)
{
struct wsc_attr_builder *builder;
uint8_t *ret;
builder = wsc_attr_builder_new(1024);
build_version(builder, 0x10);
build_message_type(builder, WSC_MESSAGE_TYPE_M2);
build_enrollee_nonce(builder, m2->enrollee_nonce);
build_registrar_nonce(builder, m2->registrar_nonce);
build_uuid_r(builder, m2->uuid_r);
build_public_key(builder, m2->public_key);
build_authentication_type_flags(builder, m2->auth_type_flags);
build_encryption_type_flags(builder, m2->encryption_type_flags);
build_connection_type_flags(builder, m2->connection_type_flags);
build_configuration_methods(builder, m2->config_methods);
build_manufacturer(builder, m2->manufacturer);
build_model_name(builder, m2->model_name);
build_model_number(builder, m2->model_number);
build_serial_number(builder, m2->serial_number);
build_primary_device_type(builder, &m2->primary_device_type);
build_device_name(builder, m2->device_name);
build_rf_bands(builder, m2->rf_bands);
build_association_state(builder, m2->association_state);
build_configuration_error(builder, m2->configuration_error);
build_device_password_id(builder, m2->device_password_id);
build_os_version(builder, m2->os_version);
if (!m2->version2)
goto done;
/* Put in the WFA Vendor Extension */
wsc_attr_builder_start_attr(builder, WSC_ATTR_VENDOR_EXTENSION);
wsc_attr_builder_put_oui(builder, wfa_ext);
wsc_attr_builder_put_u8(builder, WSC_WFA_EXTENSION_VERSION2);
wsc_attr_builder_put_u8(builder, 1);
wsc_attr_builder_put_u8(builder, 0x20);
done:
build_authenticator(builder, m2->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)
{
/* Reuse the NSID from WPA Supplicant for compatibility */

1
src/wscutil.h
View File

@ -442,5 +442,6 @@ int wsc_parse_m2(const uint8_t *pdu, uint32_t len, struct wsc_m2 *out);
uint8_t *wsc_build_probe_request(const struct wsc_probe_request *probe_request,
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);
bool wsc_uuid_from_addr(const uint8_t addr[], uint8_t *out_uuid);