diff --git a/Makefile.am b/Makefile.am index f2bd6f9..6f4adbe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,8 +74,8 @@ tests_check_parser_CFLAGS = @check_CFLAGS@ $(PARSER_CFLAGS) $(STROPHE_FLAGS) \ tests_check_parser_LDADD = @check_LIBS@ $(STROPHE_LIBS) tests_check_parser_LDFLAGS = -static -tests_test_rand_SOURCES = tests/test_rand.c src/sha1.c +tests_test_rand_SOURCES = tests/test_rand.c tests/test.c src/sha1.c tests_test_rand_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src -tests_test_scram_SOURCES = tests/test_scram.c src/sha1.c +tests_test_scram_SOURCES = tests/test_scram.c tests/test.c src/sha1.c tests_test_scram_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src diff --git a/tests/test.c b/tests/test.c new file mode 100644 index 0000000..9930b9b --- /dev/null +++ b/tests/test.c @@ -0,0 +1,54 @@ +/* test.c + * strophe XMPP client library -- common routines for tests + * + * Copyright (C) 2014 Dmitry Podgorny + * + * This software is provided AS-IS with no warranty, either express + * or implied. + * + * This program is dual licensed under the MIT and GPLv3 licenses. + */ + +#include +#include + +#include "test.h" + +static uint8_t char_to_bin(char c) +{ + return c <= '9' ? (uint8_t)(c - '0') : + c <= 'Z' ? (uint8_t)(c - 'A' + 10) : + (uint8_t)(c - 'a' + 10); +} + +void test_hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len) +{ + size_t len = strlen(hex); + size_t i; + + assert(len % 2 == 0); + + for (i = 0; i < len / 2; ++i) { + bin[i] = char_to_bin(hex[i * 2]) * 16 + char_to_bin(hex[i * 2 + 1]); + } + *bin_len = len / 2; +} + +const char *test_bin_to_hex(uint8_t *bin, size_t len) +{ + static char buf[2048]; + size_t i; + + static const char hex[] = {'0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; + + assert(ARRAY_SIZE(buf) > len * 2); + + for (i = 0; i < len; ++i) { + buf[i * 2] = hex[(bin[i] >> 4) & 0x0f]; + buf[i * 2 + 1] = hex[bin[i] & 0x0f]; + } + buf[len * 2] = '\0'; + + return buf; +} diff --git a/tests/test.h b/tests/test.h index 134d5b4..10129ab 100644 --- a/tests/test.h +++ b/tests/test.h @@ -1,16 +1,69 @@ +/* test.h +** libstrophe XMPP client library -- common routines for tests +** +** Copyright (C) 2005-2009 Collecta, Inc. +** +** This software is provided AS-IS with no warranty, either express +** or implied. +** +** This program is dual licensed under the MIT and GPLv3 licenses. +*/ + #ifndef __LIBSTROPHE_TEST_H__ #define __LIBSTROPHE_TEST_H__ -#define TEST_MAIN \ - int main(int argc, char **argv) {\ - int num_failed;\ - Suite *s = parser_suite();\ - SRunner *sr = srunner_create(s);\ - srunner_run_all(sr, CK_NORMAL);\ - num_failed = srunner_ntests_failed(sr);\ - srunner_free(sr);\ - return (num_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;\ - }\ - +#include +#include +#include +#include "ostypes.h" + +#define TEST_MAIN \ +int main(int argc, char **argv) { \ + int num_failed; \ + Suite *s = parser_suite(); \ + SRunner *sr = srunner_create(s); \ + srunner_run_all(sr, CK_NORMAL); \ + num_failed = srunner_ntests_failed(sr); \ + srunner_free(sr); \ + return (num_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; \ +} + +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#endif + +#define COMPARE(v1, v2) \ +do { \ + const char *__v1 = v1; \ + const char *__v2 = v2; \ + if (strcmp(__v1, __v2) != 0) { \ + printf("%s differs!\n" \ + "expected: %s\n" \ + "got: %s\n", \ + #v1, __v1, __v2); \ + exit(1); \ + } \ +} while (0) + +#define COMPARE_BUF(v1, len1, v2, len2) \ +do { \ + const uint8_t *__v1 = (uint8_t *)(v1); \ + const uint8_t *__v2 = (uint8_t *)(v2); \ + size_t __len1 = len1; \ + size_t __len2 = len2; \ + if (__len1 != __len2 || \ + memcmp(__v1, __v2, __len1) != 0) \ + { \ + printf("%s differs!\n", #v1); \ + printf("expected: 0x%s\n", \ + test_bin_to_hex(__v1, __len1); \ + printf("got: 0x%s\n", \ + test_bin_to_hex(__v2, __len2); \ + exit(1); \ + } \ +} while (0) + +void test_hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len); +const char *test_bin_to_hex(uint8_t *bin, size_t len); #endif /* __LIBSTROPHE_TEST_H__ */ diff --git a/tests/test_rand.c b/tests/test_rand.c index 831943b..04ff29a 100644 --- a/tests/test_rand.c +++ b/tests/test_rand.c @@ -9,19 +9,17 @@ * This program is dual licensed under the MIT and GPLv3 licenses. */ -/* gcc -o test_rand -I. -I./src tests/test_rand.c src/sha1.c */ +/* gcc -o test_rand -I./src tests/test_rand.c tests/test.c src/sha1.c */ #include #include #include +#include "test.h" + /* include rand.c to access private structures and functions */ #include "rand.c" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) -#endif - /* stubs to build test without whole libstrophe */ void *xmpp_alloc(const xmpp_ctx_t * const ctx, const size_t size) { return NULL; @@ -103,53 +101,6 @@ static struct { }, }; -static uint8_t char_to_bin(char c) -{ - return c <= '9' ? (uint8_t)(c - '0') : - c <= 'Z' ? (uint8_t)(c - 'A' + 10) : - (uint8_t)(c - 'a' + 10); -} - -static void hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len) -{ - size_t len = strlen(hex); - size_t i; - - assert(len % 2 == 0); - - for (i = 0; i < len / 2; ++i) { - bin[i] = char_to_bin(hex[i * 2]) * 16 + char_to_bin(hex[i * 2 + 1]); - } - *bin_len = len / 2; -} - -static const char *bin_to_hex(uint8_t *bin, size_t len) -{ - static char buf[1024]; - size_t i; - - assert(ARRAY_SIZE(buf) > len * 2); - - for (i = 0; i < len; ++i) { - sprintf(buf + i * 2, "%02x", bin[i]); - } - - return buf; -} - -#define COMPARE(v1, v2) \ -do { \ - const char *__v1 = v1; \ - const char *__v2 = v2; \ - if (strcmp(__v1, __v2) != 0) { \ - printf("%s differs!\n" \ - "expected: %s\n" \ - "got: %s\n", \ - #v1, __v1, __v2); \ - exit(1); \ - } \ -} while (0) - int main() { size_t i; @@ -160,30 +111,31 @@ int main() uint8_t output[1024]; Hash_DRBG_CTX ctx; + printf("Hash_DRBG tests.\n"); for (i = 0; i < ARRAY_SIZE(test_vectors); ++i) { printf("Test #%d: ", (int)i + 1); - hex_to_bin(test_vectors[i].entropy_input, entropy_input, - &entropy_input_len); - hex_to_bin(test_vectors[i].nonce, nonce, &nonce_len); + test_hex_to_bin(test_vectors[i].entropy_input, entropy_input, + &entropy_input_len); + test_hex_to_bin(test_vectors[i].nonce, nonce, &nonce_len); Hash_DRBG_Instantiate(&ctx, entropy_input, entropy_input_len, nonce, nonce_len); - COMPARE(test_vectors[i].V1, bin_to_hex(ctx.V, sizeof(ctx.V))); - COMPARE(test_vectors[i].C1, bin_to_hex(ctx.C, sizeof(ctx.C))); + COMPARE(test_vectors[i].V1, test_bin_to_hex(ctx.V, sizeof(ctx.V))); + COMPARE(test_vectors[i].C1, test_bin_to_hex(ctx.C, sizeof(ctx.C))); assert(ctx.reseed_counter == 1); Hash_DRBG_Generate(&ctx, output, test_vectors[i].returned_bytes); - COMPARE(test_vectors[i].V2, bin_to_hex(ctx.V, sizeof(ctx.V))); - COMPARE(test_vectors[i].C2, bin_to_hex(ctx.C, sizeof(ctx.C))); + COMPARE(test_vectors[i].V2, test_bin_to_hex(ctx.V, sizeof(ctx.V))); + COMPARE(test_vectors[i].C2, test_bin_to_hex(ctx.C, sizeof(ctx.C))); assert(ctx.reseed_counter == 2); Hash_DRBG_Generate(&ctx, output, test_vectors[i].returned_bytes); - COMPARE(test_vectors[i].V3, bin_to_hex(ctx.V, sizeof(ctx.V))); - COMPARE(test_vectors[i].C3, bin_to_hex(ctx.C, sizeof(ctx.C))); + COMPARE(test_vectors[i].V3, test_bin_to_hex(ctx.V, sizeof(ctx.V))); + COMPARE(test_vectors[i].C3, test_bin_to_hex(ctx.C, sizeof(ctx.C))); COMPARE(test_vectors[i].output, - bin_to_hex(output, test_vectors[i].returned_bytes)); + test_bin_to_hex(output, test_vectors[i].returned_bytes)); assert(ctx.reseed_counter == 3); - printf("ok\n"); + printf("ok\n"); } return 0; diff --git a/tests/test_scram.c b/tests/test_scram.c index 091ce8f..7ae7347 100644 --- a/tests/test_scram.c +++ b/tests/test_scram.c @@ -9,68 +9,18 @@ * This program is dual licensed under the MIT and GPLv3 licenses. */ -/* gcc -o test_scram -I. -I./src tests/test_scram.c src/sha1.c */ +/* gcc -o test_scram -I./src tests/test_scram.c tests/test.c src/sha1.c */ #include #include #include #include +#include "test.h" + /* include scram.c to access static functions */ #include "scram.c" -/* TODO Make common code for tests. */ - -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) -#endif - -static uint8_t char_to_bin(char c) -{ - return c <= '9' ? (uint8_t)(c - '0') : - c <= 'Z' ? (uint8_t)(c - 'A' + 10) : - (uint8_t)(c - 'a' + 10); -} - -static void hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len) -{ - size_t len = strlen(hex); - size_t i; - - assert(len % 2 == 0); - - for (i = 0; i < len / 2; ++i) { - bin[i] = char_to_bin(hex[i * 2]) * 16 + char_to_bin(hex[i * 2 + 1]); - } - *bin_len = len / 2; -} - -static const char *bin_to_hex(uint8_t *bin, size_t len) -{ - static char buf[1024]; - size_t i; - - assert(ARRAY_SIZE(buf) > len * 2); - - for (i = 0; i < len; ++i) { - sprintf(buf + i * 2, "%02x", bin[i]); - } - return buf; -} - -#define COMPARE(v1, v2) \ -do { \ - const char *__v1 = v1; \ - const char *__v2 = v2; \ - if (strcmp(__v1, __v2) != 0) { \ - printf("%s differs!\n" \ - "expected: %s\n" \ - "got: %s\n", \ - #v1, __v1, __v2); \ - exit(1); \ - } \ -} while (0) - /* * Test vectors for derivation function (RFC6070). */ @@ -120,7 +70,7 @@ static void test_df(void) SCRAM_SHA1_Hi((uint8_t *)df_vectors[i].P, df_vectors[i].P_len, (uint8_t *)df_vectors[i].S, df_vectors[i].S_len, df_vectors[i].c, dk); - s = bin_to_hex(dk, sizeof(dk)); + s = test_bin_to_hex(dk, sizeof(dk)); COMPARE(df_vectors[i].DK, s); printf("ok\n"); } @@ -141,9 +91,9 @@ static const struct { .initial = "n,,n=juliet,r=oMsTAAwAAAAMAAAANP0TAAAAAABPU0AA", .challenge = "r=oMsTAAwAAAAMAAAANP0TAAAAAABPU0AAe124695b-69a9-4de6-9c30" "-b51b3808c59e,s=NjhkYTM0MDgtNGY0Zi00NjdmLTkxMmUtNDlmNTNmN" - "DNkMDMz,i=4096", + "DNkMDMz,i=4096", .response = "c=biws,r=oMsTAAwAAAAMAAAANP0TAAAAAABPU0AAe124695b-69a9-4de" - "6-9c30-b51b3808c59e", + "6-9c30-b51b3808c59e", .salt = "36386461333430382d346634662d34363766" "2d393132652d343966353366343364303333", .i = 4096, @@ -168,7 +118,7 @@ static void test_scram(void) snprintf(auth, sizeof(auth), "%s,%s,%s", scram_vectors[i].initial + 3, scram_vectors[i].challenge, scram_vectors[i].response); - hex_to_bin(scram_vectors[i].salt, salt, &salt_len); + test_hex_to_bin(scram_vectors[i].salt, salt, &salt_len); SCRAM_SHA1_ClientKey((uint8_t *)scram_vectors[i].password, strlen(scram_vectors[i].password), @@ -177,9 +127,9 @@ static void test_scram(void) for (j = 0; j < SHA1_DIGEST_SIZE; j++) { sign[j] ^= key[j]; } - s = bin_to_hex(sign, SHA1_DIGEST_SIZE); - COMPARE(scram_vectors[i].sign, s); - printf("ok\n"); + s = test_bin_to_hex(sign, SHA1_DIGEST_SIZE); + COMPARE(scram_vectors[i].sign, s); + printf("ok\n"); } }