kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2618 from seven1240/b64-decode 

[core] fix base64 decoded size when encoded string contains padding =
This commit is contained in:
Anthony Minessale 2024-10-09 10:11:38 -05:00 committed by GitHub
parent c402ce1dee ef3bd2d8c3
commit a891067b89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/switch_utils.c
View File

@ -1076,7 +1076,7 @@ SWITCH_DECLARE(switch_size_t) switch_b64_decode(const char *in, char *out, switc
l64[(int) switch_b64_table[i]] = (char) i;
}
for (ip = in; ip && *ip; ip++) {
for (ip = in; ip && *ip && (*ip != '='); ip++) {
c = l64[(int) *ip];
if (c == -1) {
continue;

43
tests/unit/switch_utils.c
View File

@ -80,6 +80,49 @@ FST_TEST_BEGIN(b64)
}
FST_TEST_END()
FST_TEST_BEGIN(b64_pad2)
{
switch_size_t size;
char str[] = {0, 0, 0, 0};
unsigned char b64_str[128];
char decoded_str[128];
int i;
switch_status_t status = switch_b64_encode((unsigned char *)str, sizeof(str), b64_str, sizeof(b64_str));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "b64_str: %s\n", b64_str);
fst_check(status == SWITCH_STATUS_SUCCESS);
fst_check_string_equals((const char *)b64_str, "AAAAAA==");
size = switch_b64_decode((const char *)b64_str, decoded_str, sizeof(decoded_str));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "decoded_str: %s\n", decoded_str);
fst_check_string_equals(decoded_str, str);
fst_check(size == sizeof(str) + 1);
for (i = 0; i < sizeof(str); i++) {
fst_check(decoded_str[i] == str[i]);
}
}
FST_TEST_END()
FST_TEST_BEGIN(b64_pad1)
{
switch_size_t size;
char str[] = {0, 0, 0, 0, 0};
unsigned char b64_str[128];
char decoded_str[128];
int i;
switch_status_t status = switch_b64_encode((unsigned char *)str, sizeof(str), b64_str, sizeof(b64_str));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "b64_str: %s\n", b64_str);
fst_check(status == SWITCH_STATUS_SUCCESS);
fst_check_string_equals((const char *)b64_str, "AAAAAAA=");
size = switch_b64_decode((const char *)b64_str, decoded_str, sizeof(decoded_str));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "decoded_str: %s\n", decoded_str);
fst_check_string_equals(decoded_str, str);
fst_check(size == sizeof(str) + 1);
for (i = 0; i < sizeof(str); i++) {
fst_check(decoded_str[i] == str[i]);
}
}
FST_TEST_END()
FST_SUITE_END()