fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 12:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

systemd: drop nm_sd_utils_unbase64{char,mem}() wrappers

Browse source 
They are unused now.
This commit is contained in:
Thomas Haller 2022-04-11 17:57:28 +02:00
parent cdc3e3fa95
commit 82cac62fe2
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 0 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/core/tests/test-systemd.c
View file

@ -133,108 +133,6 @@ test_path_equal(void)
/*****************************************************************************/
static void
_test_unbase64char(char ch, gboolean maybe_invalid)
{
int r;
r = nm_sd_utils_unbase64char(ch, FALSE);
if (ch == '=') {
g_assert(!maybe_invalid);
g_assert_cmpint(r, <, 0);
g_assert_cmpint(nm_sd_utils_unbase64char(ch, TRUE), ==, G_MAXINT);
g_assert_cmpint(nm_unbase64char(ch), ==, -ERANGE);
} else {
g_assert_cmpint(nm_unbase64char(ch), ==, r);
g_assert_cmpint(r, ==, nm_sd_utils_unbase64char(ch, TRUE));
if (r >= 0)
g_assert_cmpint(r, <=, 255);
if (!maybe_invalid)
g_assert_cmpint(r, >=, 0);
}
}
static void
_test_unbase64mem_mem(const char *base64, const guint8 *expected_arr, gsize expected_len)
{
gs_free char *expected_base64 = NULL;
int r;
nm_auto_free guint8 *exp2_arr = NULL;
nm_auto_free guint8 *exp3_arr = NULL;
gsize exp2_len;
gsize exp3_len;
gsize i;
expected_base64 = g_base64_encode(expected_arr, expected_len);
for (i = 0; expected_base64[i]; i++)
_test_unbase64char(expected_base64[i], FALSE);
r = nm_sd_utils_unbase64mem(expected_base64,
strlen(expected_base64),
TRUE,
&exp2_arr,
&exp2_len);
g_assert_cmpint(r, ==, 0);
g_assert_cmpmem(expected_arr, expected_len, exp2_arr, exp2_len);
if (!nm_streq(base64, expected_base64)) {
r = nm_sd_utils_unbase64mem(base64, strlen(base64), TRUE, &exp3_arr, &exp3_len);
g_assert_cmpint(r, ==, 0);
g_assert_cmpmem(expected_arr, expected_len, exp3_arr, exp3_len);
}
}
#define _test_unbase64mem(base64, expected_str) \
_test_unbase64mem_mem(base64, (const guint8 *) "" expected_str "", NM_STRLEN(expected_str))
static void
_test_unbase64mem_inval(const char *base64)
{
gs_free guint8 *exp_arr = NULL;
gsize exp_len = 0;
int r;
r = nm_sd_utils_unbase64mem(base64, strlen(base64), TRUE, &exp_arr, &exp_len);
g_assert_cmpint(r, <, 0);
g_assert(!exp_arr);
g_assert(exp_len == 0);
}
static void
test_nm_sd_utils_unbase64mem(void)
{
gs_free char *rnd_base64 = NULL;
guint8 rnd_buf[30];
guint i, rnd_len;
_test_unbase64mem("", "");
_test_unbase64mem(" ", "");
_test_unbase64mem(" Y Q == ", "a");
_test_unbase64mem(" Y WJjZGV mZ 2g = ", "abcdefgh");
_test_unbase64mem_inval(" Y %WJjZGV mZ 2g = ");
_test_unbase64mem_inval(" Y %WJjZGV mZ 2g = a");
_test_unbase64mem("YQ==", "a");
_test_unbase64mem_inval("YQ==a");
rnd_len = nmtst_get_rand_uint32() % sizeof(rnd_buf);
for (i = 0; i < rnd_len; i++)
rnd_buf[i] = nmtst_get_rand_uint32() % 256;
rnd_base64 = g_base64_encode(rnd_buf, rnd_len);
_test_unbase64mem_mem(rnd_base64, rnd_buf, rnd_len);
_test_unbase64char('=', FALSE);
for (i = 0; i < 10; i++) {
char ch = nmtst_get_rand_uint32() % 256;
if (ch != '=')
_test_unbase64char(ch, TRUE);
}
}
/*****************************************************************************/
NMTST_DEFINE();
int
@ -245,7 +143,6 @@ main(int argc, char **argv)
g_test_add_func("/systemd/lldp/create", test_lldp_create);
g_test_add_func("/systemd/sd-event", test_sd_event);
g_test_add_func("/systemd/test_path_equal", test_path_equal);
g_test_add_func("/systemd/test_nm_sd_utils_unbase64mem", test_nm_sd_utils_unbase64mem);
return g_test_run();
}

32
src/libnm-systemd-shared/nm-sd-utils-shared.c
View file

@ -41,38 +41,6 @@ nm_sd_utils_path_startswith(const char *path, const char *prefix)
/*****************************************************************************/
int
nm_sd_utils_unbase64char(char ch, gboolean accept_padding_equal)
{
if (ch == '=' && accept_padding_equal)
return G_MAXINT;
return unbase64char(ch);
}
/**
* nm_sd_utils_unbase64mem:
* @p: a valid base64 string. Whitespace is ignored, but invalid encodings
* will cause the function to fail.
* @l: the length of @p. @p is not treated as NUL terminated string but
* merely as a buffer of ascii characters.
* @secure: whether the temporary memory will be cleared to avoid leaving
* secrets in memory (see also nm_explicit_bzero()).
* @mem: (transfer full): the decoded buffer on success.
* @len: the length of @mem on success.
*
* glib provides g_base64_decode(), but that does not report any errors
* from invalid encodings. Expose systemd's implementation which does
* reject invalid inputs.
*
* Returns: a non-negative code on success. Invalid encoding let the
* function fail.
*/
int
nm_sd_utils_unbase64mem(const char *p, size_t l, gboolean secure, guint8 **mem, size_t *len)
{
return unbase64mem_full(p, l, secure, (void **) mem, len);
}
int
nm_sd_dns_name_to_wire_format(const char *domain, guint8 *buffer, size_t len, gboolean canonical)
{

6
src/libnm-systemd-shared/nm-sd-utils-shared.h
View file

@ -16,12 +16,6 @@ const char *nm_sd_utils_path_startswith(const char *path, const char *prefix);
/*****************************************************************************/
int nm_sd_utils_unbase64char(char ch, gboolean accept_padding_equal);
int nm_sd_utils_unbase64mem(const char *p, size_t l, gboolean secure, guint8 **mem, size_t *len);
/*****************************************************************************/
int
nm_sd_dns_name_to_wire_format(const char *domain, guint8 *buffer, size_t len, gboolean canonical);