Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-10-04 02:18:49 +02:00
Code Releases Activity

wscutil: Handle a deprecated network key format

Browse Source 
Implement a note from the spec saying that implementations should handle
NUL-terminated Network Keys inside credentials structures.
This commit is contained in:
Andrew Zaborowski 2020-08-13 02:50:11 +02:00 committed by Denis Kenzior
parent 930df7a2b9
commit a95cd4f0fa
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wscutil.c
View File

@ -362,13 +362,25 @@ static bool extract_network_key(struct wsc_attr_iter *iter, void *data)
{ {
struct iovec *network_key = data; struct iovec *network_key = data;
unsigned int len; unsigned int len;
const uint8_t *key;
len = wsc_attr_iter_get_length(iter); len = wsc_attr_iter_get_length(iter);
if (len > 64) if (len > 64)
return false; return false;
/*
* WSC 2.0.5, Section 12, Network Key:
* "Some existing implementations based on v1.0h null-terminate the
* passphrase value, i.e., add an extra 0x00 octet into the end of
* the value. For backwards compatibility, implementations shall be
* able to parse such a value"
*/
key = wsc_attr_iter_get_data(iter);
if (len && key[len - 1] == 0x00)
len--;
network_key->iov_len = len; network_key->iov_len = len;
network_key->iov_base = (void *) wsc_attr_iter_get_data(iter); network_key->iov_base = (void *) key;
return true; return true;
} }