From de1c645a79d42c37dffb7f52e9c643b6251fdcd0 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 30 May 2016 22:39:39 +0300 Subject: [PATCH] lib-dcrypt: Use base64 encoded test samples --- src/lib-dcrypt/Makefile.am | 4 +- src/lib-dcrypt/sample-v1.asc | 48 ++++++ src/lib-dcrypt/sample-v1.bin | Bin 2281 -> 0 bytes src/lib-dcrypt/sample-v2.asc | 287 +++++++++++++++++++++++++++++++++++ src/lib-dcrypt/sample-v2.bin | Bin 13757 -> 0 bytes src/lib-dcrypt/test-stream.c | 37 +++-- 6 files changed, 358 insertions(+), 18 deletions(-) create mode 100644 src/lib-dcrypt/sample-v1.asc delete mode 100644 src/lib-dcrypt/sample-v1.bin create mode 100644 src/lib-dcrypt/sample-v2.asc delete mode 100644 src/lib-dcrypt/sample-v2.bin diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am index 98666d8c99..5f24f3ea51 100644 --- a/src/lib-dcrypt/Makefile.am +++ b/src/lib-dcrypt/Makefile.am @@ -33,8 +33,8 @@ pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) EXTRA_DIST = \ - sample-v1.bin \ - sample-v2.bin + sample-v1.asc \ + sample-v2.asc check_PROGRAMS = test-crypto test-stream diff --git a/src/lib-dcrypt/sample-v1.asc b/src/lib-dcrypt/sample-v1.asc new file mode 100644 index 0000000000..c69fb50954 --- /dev/null +++ b/src/lib-dcrypt/sample-v1.asc @@ -0,0 +1,48 @@ +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 +d/l7J6LsH25I/zsIV/0OHcrvMUEf2WzU3Q== diff --git a/src/lib-dcrypt/sample-v1.bin b/src/lib-dcrypt/sample-v1.bin deleted file mode 100644 index e43e95b518a27a95de1758f398e6fc4282c1c046..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 2281 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 { i_stream_skip(is_3, siz); } + while((siz = i_stream_read(is_4))>0) { i_stream_skip(is_4, siz); } - if (is_3->stream_errno != 0) - i_debug("error: %s", i_stream_get_error(is_3)); + if (is_4->stream_errno != 0) + i_debug("error: %s", i_stream_get_error(is_4)); - test_assert(is_3->stream_errno == 0); + test_assert(is_4->stream_errno == 0); - i_stream_unref(&is_3); + i_stream_unref(&is_4); hash->result(hash_ctx, hash_dgst); @@ -88,20 +91,22 @@ void test_static_v2_input(void) unsigned char hash_dgst[hash->digest_size]; hash->init(hash_ctx); - struct istream *is_1 = i_stream_create_file("sample-v2.bin", IO_BLOCK_SIZE); - struct istream *is_2 = i_stream_create_decrypt(is_1, test_v2_kp.priv); + struct istream *is_1 = i_stream_create_file("sample-v2.asc", IO_BLOCK_SIZE); + struct istream *is_2 = i_stream_create_base64_decoder(is_1); i_stream_unref(&is_1); - struct istream *is_3 = i_stream_create_hash(is_2, hash, hash_ctx); + struct istream *is_3 = i_stream_create_decrypt(is_2, test_v2_kp.priv); i_stream_unref(&is_2); + struct istream *is_4 = i_stream_create_hash(is_3, hash, hash_ctx); + i_stream_unref(&is_3); - while((amt = i_stream_read(is_3))>0) { i_stream_skip(is_3, amt); } + while((amt = i_stream_read(is_4))>0) { i_stream_skip(is_4, amt); } - if (is_3->stream_errno != 0) - i_debug("error: %s", i_stream_get_error(is_3)); + if (is_4->stream_errno != 0) + i_debug("error: %s", i_stream_get_error(is_4)); - test_assert(is_3->stream_errno == 0); + test_assert(is_4->stream_errno == 0); - i_stream_unref(&is_3); + i_stream_unref(&is_4); hash->result(hash_ctx, hash_dgst); -- 2.47.3