Hi
On Tue, Jul 31, 2018 at 4:49 PM, Jakub Jelen <jjelen@xxxxxxxxxx> wrote:
> * The CAC is sometimes using nested SimpleTLV structures that might
> be ambiguous, which is covered too.
>
> Signed-off-by: Jakub Jelen <jjelen@xxxxxxxxxx>
> Reviewed-by: Robert Relyea <rrelyea@xxxxxxxxxx>
> ---
> Makefile.am | 13 ++-
> docs/libcacard.txt | 1 +
> tests/simpletlv.c | 207 +++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 219 insertions(+), 2 deletions(-)
> create mode 100644 tests/simpletlv.c
>
> diff --git a/Makefile.am b/Makefile.am
> index 68aa16e..2de3c32 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -68,8 +68,17 @@ endif
>
> include $(srcdir)/build-aux/glib-tap.mk
>
> -test_programs = tests/libcacard
> -tests_libcacard_LDADD = libcacard.la $(GTHREAD_LIBS)
> +test_programs = \
> + tests/simpletlv \
> + tests/libcacard
> +tests_libcacard_SOURCES = tests/libcacard.c
> +tests_libcacard_LDADD = libcacard.la \
> + src/common.lo \
> + src/simpletlv.lo \
> + $(GTHREAD_LIBS)
Why do you change tests/libcacard linking ?
I'll touch on commit
> +tests_simpletlv_LDADD = src/common.lo \
> + src/simpletlv.lo \
> + $(GTHREAD_LIBS)
I am not fond of linking with libtool objects. We should use
convenience libraries, but let's not bother with that for now.
>
> @CODE_COVERAGE_RULES@
>
> diff --git a/docs/libcacard.txt b/docs/libcacard.txt
> index 650102b..acb70d2 100644
> --- a/docs/libcacard.txt
> +++ b/docs/libcacard.txt
> @@ -485,4 +485,5 @@ src/common.h - header file utilities functions
> src/simpletlv.c - Simple TLV encoding functions
> src/simpletlv.h - header file for Simple TLV encoding helpers
> tests/libcacard.c - Test for the whole smart card emulation
> +tests/simpletlv.c - Unit tests for SimpleTLV encoding and decoding functions
>
> diff --git a/tests/simpletlv.c b/tests/simpletlv.c
> new file mode 100644
> index 0000000..0d4a66b
> --- /dev/null
> +++ b/tests/simpletlv.c
> @@ -0,0 +1,207 @@
> +#include <glib.h>
> +#include <string.h>
> +#include "simpletlv.h"
> +
> +static GMainLoop *loop;
> +
> +/* Test that length estimations are sane */
> +static void test_length_simple(void)
> +{
> + size_t length = 0;
> + unsigned char simple_value[] = "\x10\x11";
> + unsigned char long_value[256] = "Long data value";
> + static struct simpletlv_member simple[1] = {
> + {0x25, 2, {/*.value = simple_value*/}, SIMPLETLV_TYPE_LEAF}
> + };
> + simple[0].value.value = simple_value;
> +
> + /* Simple short value to TLV */
> + length = simpletlv_get_length(simple, 1, SIMPLETLV_BOTH);
> + g_assert_cmpint(length, ==, 4);
> +
> + /* Simple short value to TL */
> + length = simpletlv_get_length(simple, 1, SIMPLETLV_TL);
> + g_assert_cmpint(length, ==, 2);
> +
> + /* Simple short value to V */
> + length = simpletlv_get_length(simple, 1, SIMPLETLV_VALUE);
> + g_assert_cmpint(length, ==, 2);
> +
> +
> + /* Prepare long value */
> + simple[0].value.value = long_value;
> + simple[0].length = 256;
> +
> +
> + /* Simple long value to TLV */
> + length = simpletlv_get_length(simple, 1, SIMPLETLV_BOTH);
> + g_assert_cmpint(length, ==, 260);
> +
> + /* Simple long value to TL */
> + length = simpletlv_get_length(simple, 1, SIMPLETLV_TL);
> + g_assert_cmpint(length, ==, 4);
> +
> + /* Simple long value to V */
> + length = simpletlv_get_length(simple, 1, SIMPLETLV_VALUE);
> + g_assert_cmpint(length, ==, 256);
> +}
> +
> +static void test_length_nested(void)
> +{
> + size_t length = 0;
> + unsigned char simple_value[] = "\x12\x14";
> + static struct simpletlv_member simple[1] = {
> + {0x25, 2, {/*.value = simple_value*/}, SIMPLETLV_TYPE_LEAF}
> + };
> + static struct simpletlv_member nested[1] = {
> + {0x72, 1, {/*.child = simple*/}, SIMPLETLV_TYPE_COMPOUND}
> + };
> + simple[0].value.value = simple_value;
> + nested[0].value.child = simple;
> +
> + /* Simple short value to TLV */
> + length = simpletlv_get_length(nested, 1, SIMPLETLV_BOTH);
> + g_assert_cmpint(length, ==, 6);
> +
> + /* Nested structures do not support splitting TL and V buffers ?? */
> + /* Simple short value to TL */
> + length = simpletlv_get_length(nested, 1, SIMPLETLV_TL);
> + g_assert_cmpint(length, ==, -1);
> +
> + /* Simple short value to V */
> + length = simpletlv_get_length(nested, 1, SIMPLETLV_VALUE);
> + g_assert_cmpint(length, ==, -1);
> +}
> +
> +/* Test that we can encode arbitrary data into Simple TLV */
> +static void test_encode_simple(void)
> +{
> + unsigned char *result = NULL;
> + size_t result_len = 0;
> + unsigned char simple_value[] = "\x10\x11";
> + unsigned char simple_encoded[] = "\x25\x02\x10\x11";
> + unsigned char long_value[256] = "Long data value";
> + unsigned char long_encoded[261] = "\x25\xFF\x00\x01Long data value";
> + static struct simpletlv_member simple[1] = {
> + {0x25, 2, {/*.value = simple_value*/}, SIMPLETLV_TYPE_LEAF}
> + };
> + simple[0].value.value = simple_value;
> +
> + /* Encode simple short TLV with automatic allocation */
> + result = NULL;
> + result_len = simpletlv_encode(simple, 1, &result, 0, NULL);
> + g_assert_cmpmem(result, result_len, simple_encoded, 4);
> + g_free(result);
> +
> + /* Encode simple short TLV with pre-allocated buffer (long enough) */
> + result = g_malloc(10);
> + result_len = simpletlv_encode(simple, 1, &result, 10, NULL);
> + g_assert_cmpmem(result, result_len, simple_encoded, 4);
> + g_free(result);
> +
> + /* Encode simple short TLV with pre-allocated buffer (too short) */
> + result = g_malloc(2);
> + result_len = simpletlv_encode(simple, 1, &result, 2, NULL);
> + g_assert_cmpint(result_len, ==, -1);
> + g_free(result);
> +
> + /* Encode only TL part */
> + result = NULL;
> + result_len = simpletlv_encode_tl(simple, 1, &result, 0, NULL);
> + g_assert_cmpmem(result, result_len, "\x25\x02", 2);
> + g_free(result);
> +
> + /* Encode only VALUE part (equals to the value itself) */
> + result = NULL;
> + result_len = simpletlv_encode_val(simple, 1, &result, 0, NULL);
> + g_assert_cmpmem(result, result_len, simple_value, 2);
> + g_free(result);
> +
> +
> + /* Prepare long value */
> + memset(long_value+15, '\x00', 256-15);
> + memset(long_encoded+19, '\x00', 256-15);
> + simple[0].value.value = long_value;
> + simple[0].length = 256;
> +
> +
> + /* Encode simple long TLV with automatic allocation */
> + result = NULL;
> + result_len = simpletlv_encode(simple, 1, &result, 0, NULL);
> + g_assert_cmpmem(result, result_len, long_encoded, 260);
> + g_free(result);
> +
> + /* Encode simple long TLV with pre-allocated buffer (long enough) */
> + result = g_malloc(300);
> + result_len = simpletlv_encode(simple, 1, &result, 300, NULL);
> + g_assert_cmpmem(result, result_len, long_encoded, 260);
> + g_free(result);
> +
> +}
> +
> +/* Test that we can encode nested data into Simple TLV */
> +static void test_encode_nested(void)
> +{
> + unsigned char *result = NULL;
> + size_t result_len = 0;
> + unsigned char simple_value[] = "\x12\x14";
> + unsigned char encoded[] = "\x72\x04\x25\x02\x12\x14";
> + static struct simpletlv_member simple[1] = {
> + {0x25, 2, {/*.value = simple_value*/}, SIMPLETLV_TYPE_LEAF}
> + };
> + static struct simpletlv_member nested[1] = {
> + {0x72, 1, {/*.child = simple*/}, SIMPLETLV_TYPE_COMPOUND}
> + };
> + simple[0].value.value = simple_value;
> + nested[0].value.child = simple;
> +
> + /* Encode nested TLV with automatic allocation */
> + result = NULL;
> + result_len = simpletlv_encode(nested, 1, &result, 0, NULL);
> + g_assert_cmpmem(result, result_len, encoded, 6);
> + g_free(result);
> +
> + /* Encode nested TLV with pre-allocated buffer (long enough) */
> + result = g_malloc(10);
> + result_len = simpletlv_encode(nested, 1, &result, 10, NULL);
> + g_assert_cmpmem(result, result_len, encoded, 6);
> + g_free(result);
> +
> + /* Encode simple short TLV with pre-allocated buffer (too short) */
> + result = g_malloc(4);
> + result_len = simpletlv_encode(nested, 1, &result, 4, NULL);
> + g_assert_cmpint(result_len, ==, -1);
> + g_free(result);
> +
> + /* Encode only TL part */
> + result = NULL;
> + result_len = simpletlv_encode_tl(nested, 1, &result, 0, NULL);
> + g_assert_cmpint(result_len, ==, -1);
> +
> + /* Encode only VALUE part (equals to the value itself) */
> + result = NULL;
> + result_len = simpletlv_encode_val(nested, 1, &result, 0, NULL);
> + g_assert_cmpint(result_len, ==, -1);
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + int ret;
> +
> + g_test_init(&argc, &argv, NULL);
> +
> + loop = g_main_loop_new(NULL, TRUE);
> +
> + g_test_add_func("/simpletlv/length/simple", test_length_simple);
> + g_test_add_func("/simpletlv/length/nested", test_length_nested);
> + g_test_add_func("/simpletlv/encode/simple", test_encode_simple);
> + g_test_add_func("/simpletlv/encode/nested", test_encode_nested);
> +
> + ret = g_test_run();
> +
> + g_main_loop_unref(loop);
> +
> + return ret;
> +}
> +
> +/* vim: set ts=4 sw=4 tw=0 noet expandtab: */
> --
> 2.17.1
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
--
Marc-André Lureau
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel