Remove newlines from wpa_supplicant config network output

Spurious newlines output while writing the config file can corrupt the
wpa_supplicant configuration. Avoid writing these for the network block
parameters. This is a generic filter that cover cases that may not have
been explicitly addressed with a more specific commit to avoid control
characters in the psk parameter.

Signed-off-by: Paul Stewart <pstew@google.com>
This commit is contained in:
Paul Stewart 2016-03-03 15:40:19 -08:00 committed by Jouni Malinen
parent 5594df44c7
commit 0fe5a23424
3 changed files with 25 additions and 2 deletions

View file

@ -709,6 +709,17 @@ int has_ctrl_char(const u8 *data, size_t len)
}
int has_newline(const char *str)
{
while (*str) {
if (*str == '\n' || *str == '\r')
return 1;
str++;
}
return 0;
}
size_t merge_byte_arrays(u8 *res, size_t res_len,
const u8 *src1, size_t src1_len,
const u8 *src2, size_t src2_len)