WPS: Move attribute parser definitions into a new header file
This allows wps/wps_attr_parse.h to be included into files outside src/wps. Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen
parent
78e625f79a
commit
6b5a0c9466
3 changed files with 110 additions and 95 deletions
|
|
@ -9,7 +9,8 @@
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "wps_i.h"
|
#include "wps_defs.h"
|
||||||
|
#include "wps_attr_parse.h"
|
||||||
|
|
||||||
#ifndef CONFIG_WPS_STRICT
|
#ifndef CONFIG_WPS_STRICT
|
||||||
#define WPS_WORKAROUNDS
|
#define WPS_WORKAROUNDS
|
||||||
|
|
|
||||||
107
src/wps/wps_attr_parse.h
Normal file
107
src/wps/wps_attr_parse.h
Normal file
|
|
@ -0,0 +1,107 @@
|
||||||
|
/*
|
||||||
|
* Wi-Fi Protected Setup - attribute parsing
|
||||||
|
* Copyright (c) 2008-2012, Jouni Malinen <j@w1.fi>
|
||||||
|
*
|
||||||
|
* This software may be distributed under the terms of the BSD license.
|
||||||
|
* See README for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef WPS_ATTR_PARSE_H
|
||||||
|
#define WPS_ATTR_PARSE_H
|
||||||
|
|
||||||
|
#include "wps.h"
|
||||||
|
|
||||||
|
struct wps_parse_attr {
|
||||||
|
/* fixed length fields */
|
||||||
|
const u8 *version; /* 1 octet */
|
||||||
|
const u8 *version2; /* 1 octet */
|
||||||
|
const u8 *msg_type; /* 1 octet */
|
||||||
|
const u8 *enrollee_nonce; /* WPS_NONCE_LEN (16) octets */
|
||||||
|
const u8 *registrar_nonce; /* WPS_NONCE_LEN (16) octets */
|
||||||
|
const u8 *uuid_r; /* WPS_UUID_LEN (16) octets */
|
||||||
|
const u8 *uuid_e; /* WPS_UUID_LEN (16) octets */
|
||||||
|
const u8 *auth_type_flags; /* 2 octets */
|
||||||
|
const u8 *encr_type_flags; /* 2 octets */
|
||||||
|
const u8 *conn_type_flags; /* 1 octet */
|
||||||
|
const u8 *config_methods; /* 2 octets */
|
||||||
|
const u8 *sel_reg_config_methods; /* 2 octets */
|
||||||
|
const u8 *primary_dev_type; /* 8 octets */
|
||||||
|
const u8 *rf_bands; /* 1 octet */
|
||||||
|
const u8 *assoc_state; /* 2 octets */
|
||||||
|
const u8 *config_error; /* 2 octets */
|
||||||
|
const u8 *dev_password_id; /* 2 octets */
|
||||||
|
const u8 *os_version; /* 4 octets */
|
||||||
|
const u8 *wps_state; /* 1 octet */
|
||||||
|
const u8 *authenticator; /* WPS_AUTHENTICATOR_LEN (8) octets */
|
||||||
|
const u8 *r_hash1; /* WPS_HASH_LEN (32) octets */
|
||||||
|
const u8 *r_hash2; /* WPS_HASH_LEN (32) octets */
|
||||||
|
const u8 *e_hash1; /* WPS_HASH_LEN (32) octets */
|
||||||
|
const u8 *e_hash2; /* WPS_HASH_LEN (32) octets */
|
||||||
|
const u8 *r_snonce1; /* WPS_SECRET_NONCE_LEN (16) octets */
|
||||||
|
const u8 *r_snonce2; /* WPS_SECRET_NONCE_LEN (16) octets */
|
||||||
|
const u8 *e_snonce1; /* WPS_SECRET_NONCE_LEN (16) octets */
|
||||||
|
const u8 *e_snonce2; /* WPS_SECRET_NONCE_LEN (16) octets */
|
||||||
|
const u8 *key_wrap_auth; /* WPS_KWA_LEN (8) octets */
|
||||||
|
const u8 *auth_type; /* 2 octets */
|
||||||
|
const u8 *encr_type; /* 2 octets */
|
||||||
|
const u8 *network_idx; /* 1 octet */
|
||||||
|
const u8 *network_key_idx; /* 1 octet */
|
||||||
|
const u8 *mac_addr; /* ETH_ALEN (6) octets */
|
||||||
|
const u8 *key_prov_auto; /* 1 octet (Bool) */
|
||||||
|
const u8 *dot1x_enabled; /* 1 octet (Bool) */
|
||||||
|
const u8 *selected_registrar; /* 1 octet (Bool) */
|
||||||
|
const u8 *request_type; /* 1 octet */
|
||||||
|
const u8 *response_type; /* 1 octet */
|
||||||
|
const u8 *ap_setup_locked; /* 1 octet */
|
||||||
|
const u8 *settings_delay_time; /* 1 octet */
|
||||||
|
const u8 *network_key_shareable; /* 1 octet (Bool) */
|
||||||
|
const u8 *request_to_enroll; /* 1 octet (Bool) */
|
||||||
|
|
||||||
|
/* variable length fields */
|
||||||
|
const u8 *manufacturer;
|
||||||
|
size_t manufacturer_len;
|
||||||
|
const u8 *model_name;
|
||||||
|
size_t model_name_len;
|
||||||
|
const u8 *model_number;
|
||||||
|
size_t model_number_len;
|
||||||
|
const u8 *serial_number;
|
||||||
|
size_t serial_number_len;
|
||||||
|
const u8 *dev_name;
|
||||||
|
size_t dev_name_len;
|
||||||
|
const u8 *public_key;
|
||||||
|
size_t public_key_len;
|
||||||
|
const u8 *encr_settings;
|
||||||
|
size_t encr_settings_len;
|
||||||
|
const u8 *ssid; /* <= 32 octets */
|
||||||
|
size_t ssid_len;
|
||||||
|
const u8 *network_key; /* <= 64 octets */
|
||||||
|
size_t network_key_len;
|
||||||
|
const u8 *eap_type; /* <= 8 octets */
|
||||||
|
size_t eap_type_len;
|
||||||
|
const u8 *eap_identity; /* <= 64 octets */
|
||||||
|
size_t eap_identity_len;
|
||||||
|
const u8 *authorized_macs; /* <= 30 octets */
|
||||||
|
size_t authorized_macs_len;
|
||||||
|
const u8 *sec_dev_type_list; /* <= 128 octets */
|
||||||
|
size_t sec_dev_type_list_len;
|
||||||
|
const u8 *oob_dev_password; /* 38..54 octets */
|
||||||
|
size_t oob_dev_password_len;
|
||||||
|
|
||||||
|
/* attributes that can occur multiple times */
|
||||||
|
#define MAX_CRED_COUNT 10
|
||||||
|
const u8 *cred[MAX_CRED_COUNT];
|
||||||
|
size_t cred_len[MAX_CRED_COUNT];
|
||||||
|
size_t num_cred;
|
||||||
|
|
||||||
|
#define MAX_REQ_DEV_TYPE_COUNT 10
|
||||||
|
const u8 *req_dev_type[MAX_REQ_DEV_TYPE_COUNT];
|
||||||
|
size_t num_req_dev_type;
|
||||||
|
|
||||||
|
const u8 *vendor_ext[MAX_WPS_PARSE_VENDOR_EXT];
|
||||||
|
size_t vendor_ext_len[MAX_WPS_PARSE_VENDOR_EXT];
|
||||||
|
size_t num_vendor_ext;
|
||||||
|
};
|
||||||
|
|
||||||
|
int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr);
|
||||||
|
|
||||||
|
#endif /* WPS_ATTR_PARSE_H */
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
#define WPS_I_H
|
#define WPS_I_H
|
||||||
|
|
||||||
#include "wps.h"
|
#include "wps.h"
|
||||||
|
#include "wps_attr_parse.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct wps_data - WPS registration protocol data
|
* struct wps_data - WPS registration protocol data
|
||||||
|
|
@ -117,97 +118,6 @@ struct wps_data {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
struct wps_parse_attr {
|
|
||||||
/* fixed length fields */
|
|
||||||
const u8 *version; /* 1 octet */
|
|
||||||
const u8 *version2; /* 1 octet */
|
|
||||||
const u8 *msg_type; /* 1 octet */
|
|
||||||
const u8 *enrollee_nonce; /* WPS_NONCE_LEN (16) octets */
|
|
||||||
const u8 *registrar_nonce; /* WPS_NONCE_LEN (16) octets */
|
|
||||||
const u8 *uuid_r; /* WPS_UUID_LEN (16) octets */
|
|
||||||
const u8 *uuid_e; /* WPS_UUID_LEN (16) octets */
|
|
||||||
const u8 *auth_type_flags; /* 2 octets */
|
|
||||||
const u8 *encr_type_flags; /* 2 octets */
|
|
||||||
const u8 *conn_type_flags; /* 1 octet */
|
|
||||||
const u8 *config_methods; /* 2 octets */
|
|
||||||
const u8 *sel_reg_config_methods; /* 2 octets */
|
|
||||||
const u8 *primary_dev_type; /* 8 octets */
|
|
||||||
const u8 *rf_bands; /* 1 octet */
|
|
||||||
const u8 *assoc_state; /* 2 octets */
|
|
||||||
const u8 *config_error; /* 2 octets */
|
|
||||||
const u8 *dev_password_id; /* 2 octets */
|
|
||||||
const u8 *os_version; /* 4 octets */
|
|
||||||
const u8 *wps_state; /* 1 octet */
|
|
||||||
const u8 *authenticator; /* WPS_AUTHENTICATOR_LEN (8) octets */
|
|
||||||
const u8 *r_hash1; /* WPS_HASH_LEN (32) octets */
|
|
||||||
const u8 *r_hash2; /* WPS_HASH_LEN (32) octets */
|
|
||||||
const u8 *e_hash1; /* WPS_HASH_LEN (32) octets */
|
|
||||||
const u8 *e_hash2; /* WPS_HASH_LEN (32) octets */
|
|
||||||
const u8 *r_snonce1; /* WPS_SECRET_NONCE_LEN (16) octets */
|
|
||||||
const u8 *r_snonce2; /* WPS_SECRET_NONCE_LEN (16) octets */
|
|
||||||
const u8 *e_snonce1; /* WPS_SECRET_NONCE_LEN (16) octets */
|
|
||||||
const u8 *e_snonce2; /* WPS_SECRET_NONCE_LEN (16) octets */
|
|
||||||
const u8 *key_wrap_auth; /* WPS_KWA_LEN (8) octets */
|
|
||||||
const u8 *auth_type; /* 2 octets */
|
|
||||||
const u8 *encr_type; /* 2 octets */
|
|
||||||
const u8 *network_idx; /* 1 octet */
|
|
||||||
const u8 *network_key_idx; /* 1 octet */
|
|
||||||
const u8 *mac_addr; /* ETH_ALEN (6) octets */
|
|
||||||
const u8 *key_prov_auto; /* 1 octet (Bool) */
|
|
||||||
const u8 *dot1x_enabled; /* 1 octet (Bool) */
|
|
||||||
const u8 *selected_registrar; /* 1 octet (Bool) */
|
|
||||||
const u8 *request_type; /* 1 octet */
|
|
||||||
const u8 *response_type; /* 1 octet */
|
|
||||||
const u8 *ap_setup_locked; /* 1 octet */
|
|
||||||
const u8 *settings_delay_time; /* 1 octet */
|
|
||||||
const u8 *network_key_shareable; /* 1 octet (Bool) */
|
|
||||||
const u8 *request_to_enroll; /* 1 octet (Bool) */
|
|
||||||
|
|
||||||
/* variable length fields */
|
|
||||||
const u8 *manufacturer;
|
|
||||||
size_t manufacturer_len;
|
|
||||||
const u8 *model_name;
|
|
||||||
size_t model_name_len;
|
|
||||||
const u8 *model_number;
|
|
||||||
size_t model_number_len;
|
|
||||||
const u8 *serial_number;
|
|
||||||
size_t serial_number_len;
|
|
||||||
const u8 *dev_name;
|
|
||||||
size_t dev_name_len;
|
|
||||||
const u8 *public_key;
|
|
||||||
size_t public_key_len;
|
|
||||||
const u8 *encr_settings;
|
|
||||||
size_t encr_settings_len;
|
|
||||||
const u8 *ssid; /* <= 32 octets */
|
|
||||||
size_t ssid_len;
|
|
||||||
const u8 *network_key; /* <= 64 octets */
|
|
||||||
size_t network_key_len;
|
|
||||||
const u8 *eap_type; /* <= 8 octets */
|
|
||||||
size_t eap_type_len;
|
|
||||||
const u8 *eap_identity; /* <= 64 octets */
|
|
||||||
size_t eap_identity_len;
|
|
||||||
const u8 *authorized_macs; /* <= 30 octets */
|
|
||||||
size_t authorized_macs_len;
|
|
||||||
const u8 *sec_dev_type_list; /* <= 128 octets */
|
|
||||||
size_t sec_dev_type_list_len;
|
|
||||||
const u8 *oob_dev_password; /* 38..54 octets */
|
|
||||||
size_t oob_dev_password_len;
|
|
||||||
|
|
||||||
/* attributes that can occur multiple times */
|
|
||||||
#define MAX_CRED_COUNT 10
|
|
||||||
const u8 *cred[MAX_CRED_COUNT];
|
|
||||||
size_t cred_len[MAX_CRED_COUNT];
|
|
||||||
size_t num_cred;
|
|
||||||
|
|
||||||
#define MAX_REQ_DEV_TYPE_COUNT 10
|
|
||||||
const u8 *req_dev_type[MAX_REQ_DEV_TYPE_COUNT];
|
|
||||||
size_t num_req_dev_type;
|
|
||||||
|
|
||||||
const u8 *vendor_ext[MAX_WPS_PARSE_VENDOR_EXT];
|
|
||||||
size_t vendor_ext_len[MAX_WPS_PARSE_VENDOR_EXT];
|
|
||||||
size_t num_vendor_ext;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* wps_common.c */
|
/* wps_common.c */
|
||||||
void wps_kdf(const u8 *key, const u8 *label_prefix, size_t label_prefix_len,
|
void wps_kdf(const u8 *key, const u8 *label_prefix, size_t label_prefix_len,
|
||||||
const char *label, u8 *res, size_t res_len);
|
const char *label, u8 *res, size_t res_len);
|
||||||
|
|
@ -230,9 +140,6 @@ extern struct oob_nfc_device_data oob_nfc_pn531_device_data;
|
||||||
struct wpabuf * wps_build_wsc_ack(struct wps_data *wps);
|
struct wpabuf * wps_build_wsc_ack(struct wps_data *wps);
|
||||||
struct wpabuf * wps_build_wsc_nack(struct wps_data *wps);
|
struct wpabuf * wps_build_wsc_nack(struct wps_data *wps);
|
||||||
|
|
||||||
/* wps_attr_parse.c */
|
|
||||||
int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr);
|
|
||||||
|
|
||||||
/* wps_attr_build.c */
|
/* wps_attr_build.c */
|
||||||
int wps_build_public_key(struct wps_data *wps, struct wpabuf *msg);
|
int wps_build_public_key(struct wps_data *wps, struct wpabuf *msg);
|
||||||
int wps_build_req_type(struct wpabuf *msg, enum wps_request_type type);
|
int wps_build_req_type(struct wpabuf *msg, enum wps_request_type type);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue