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

DPP2: Replace connectionStatus object ssid with ssid64

Browse source 
The UTF-8 encoded ssid string was replaced with base64url encoded ssid64
string, so update the implementation to match.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-11-27 15:19:08 +02:00 committed by Jouni Malinen
parent 5632b07158
commit c54227c26a
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/common/dpp.c
View file

@ -6487,6 +6487,7 @@ enum dpp_status_error dpp_conn_status_result_rx(struct dpp_authentication *auth,
size_t unwrapped_len = 0; size_t unwrapped_len = 0;
enum dpp_status_error ret = 256; enum dpp_status_error ret = 256;
struct json_token *root = NULL, *token; struct json_token *root = NULL, *token;
struct wpabuf *ssid64;
*ssid_len = 0; *ssid_len = 0;
*channel_list = NULL; *channel_list = NULL;
@ -6561,12 +6562,12 @@ enum dpp_status_error dpp_conn_status_result_rx(struct dpp_authentication *auth,
goto fail; goto fail;
} }
token = json_get_member(root, "ssid"); ssid64 = json_get_member_base64url(root, "ssid64");
if (token && token->type == JSON_STRING && if (ssid64 && wpabuf_len(ssid64) <= SSID_MAX_LEN) {
os_strlen(token->string) <= SSID_MAX_LEN) { *ssid_len = wpabuf_len(ssid64);
*ssid_len = os_strlen(token->string); os_memcpy(ssid, wpabuf_head(ssid64), *ssid_len);
os_memcpy(ssid, token->string, *ssid_len);
} }
wpabuf_free(ssid64);
token = json_get_member(root, "channelList"); token = json_get_member(root, "channelList");
if (token && token->type == JSON_STRING && if (token && token->type == JSON_STRING &&
@ -6593,7 +6594,7 @@ struct wpabuf * dpp_build_conn_status_result(struct dpp_authentication *auth,
const u8 *ssid, size_t ssid_len, const u8 *ssid, size_t ssid_len,
const char *channel_list) const char *channel_list)
{ {
struct wpabuf *msg, *clear, *json; struct wpabuf *msg = NULL, *clear = NULL, *json;
size_t nonce_len, clear_len, attr_len; size_t nonce_len, clear_len, attr_len;
const u8 *addr[2]; const u8 *addr[2];
size_t len[2]; size_t len[2];
@ -6604,12 +6605,14 @@ struct wpabuf * dpp_build_conn_status_result(struct dpp_authentication *auth,
return NULL; return NULL;
wpabuf_printf(json, "{\"result\":%d", result); wpabuf_printf(json, "{\"result\":%d", result);
if (ssid) { if (ssid) {
char ssid_str[6 * SSID_MAX_LEN + 1]; unsigned char *ssid64;
wpabuf_put_str(json, ",\"ssid\":\""); ssid64 = base64_url_encode(ssid, ssid_len, NULL, 0);
json_escape_string(ssid_str, sizeof(ssid_str), if (!ssid64)
(const char *) ssid, ssid_len); goto fail;
wpabuf_put_str(json, ssid_str); wpabuf_put_str(json, ",\"ssid64\":\"");
wpabuf_put_str(json, (char *) ssid64);
os_free(ssid64);
wpabuf_put_str(json, "\""); wpabuf_put_str(json, "\"");
} }
if (channel_list) if (channel_list)