da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
111 lines
3.2 KiB
C
111 lines
3.2 KiB
C
/*
|
|
* QEMU base64 helper test
|
|
*
|
|
* Copyright (c) 2015 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include <glib.h>
|
|
|
|
#include "qapi/error.h"
|
|
#include "qemu/base64.h"
|
|
|
|
static void test_base64_good(void)
|
|
{
|
|
const char input[] =
|
|
"QmVjYXVzZSB3ZSBmb2N1c2VkIG9uIHRoZSBzbmFrZSwgd2UgbW\n"
|
|
"lzc2VkIHRoZSBzY29ycGlvbi4=";
|
|
const char expect[] = "Because we focused on the snake, "
|
|
"we missed the scorpion.";
|
|
|
|
size_t len;
|
|
uint8_t *actual = qbase64_decode(input,
|
|
-1,
|
|
&len,
|
|
&error_abort);
|
|
|
|
g_assert(actual != NULL);
|
|
g_assert_cmpint(len, ==, strlen(expect));
|
|
g_assert_cmpstr((char *)actual, ==, expect);
|
|
g_free(actual);
|
|
}
|
|
|
|
|
|
static void test_base64_bad(const char *input,
|
|
size_t input_len)
|
|
{
|
|
size_t len;
|
|
Error *err = NULL;
|
|
uint8_t *actual = qbase64_decode(input,
|
|
input_len,
|
|
&len,
|
|
&err);
|
|
|
|
g_assert(err != NULL);
|
|
g_assert(actual == NULL);
|
|
g_assert_cmpint(len, ==, 0);
|
|
error_free(err);
|
|
}
|
|
|
|
|
|
static void test_base64_embedded_nul(void)
|
|
{
|
|
/* We put a NUL character in the middle of the base64
|
|
* text which is invalid data, given the expected length */
|
|
const char input[] =
|
|
"QmVjYXVzZSB3ZSBmb2N1c2VkIG9uIHRoZSBzbmFrZSwgd2UgbW\0"
|
|
"lzc2VkIHRoZSBzY29ycGlvbi4=";
|
|
|
|
test_base64_bad(input, G_N_ELEMENTS(input) - 1);
|
|
}
|
|
|
|
|
|
static void test_base64_not_nul_terminated(void)
|
|
{
|
|
const char input[] =
|
|
"QmVjYXVzZSB3ZSBmb2N1c2VkIG9uIHRoZSBzbmFrZSwgd2UgbW\n"
|
|
"lzc2VkIHRoZSBzY29ycGlvbi4=";
|
|
|
|
/* Using '-2' to make us drop the trailing NUL, thus
|
|
* creating an invalid base64 sequence for decoding */
|
|
test_base64_bad(input, G_N_ELEMENTS(input) - 2);
|
|
}
|
|
|
|
|
|
static void test_base64_invalid_chars(void)
|
|
{
|
|
/* We put a single quote character in the middle
|
|
* of the base64 text which is invalid data */
|
|
const char input[] =
|
|
"QmVjYXVzZSB3ZSBmb2N1c2VkIG9uIHRoZSBzbmFrZSwgd2UgbW'"
|
|
"lzc2VkIHRoZSBzY29ycGlvbi4=";
|
|
|
|
test_base64_bad(input, strlen(input));
|
|
}
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
g_test_init(&argc, &argv, NULL);
|
|
g_test_add_func("/util/base64/good", test_base64_good);
|
|
g_test_add_func("/util/base64/embedded-nul", test_base64_embedded_nul);
|
|
g_test_add_func("/util/base64/not-nul-terminated",
|
|
test_base64_not_nul_terminated);
|
|
g_test_add_func("/util/base64/invalid-chars", test_base64_invalid_chars);
|
|
return g_test_run();
|
|
}
|