libmicrohttpd2

HTTP server C library (MHD 2.x, alpha)
Log | Files | Refs | README | LICENSE

commit 0688507f0d5eafbba86beec15382922789a5ee73
parent 4b7f569c79a1d785ae0b2e6f7c49ee2f5a837be4
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Sun, 30 Nov 2025 12:42:18 +0100

fix MD5 unit test

Diffstat:
Msrc/tests/mhdt_checks.h | 3+++
Msrc/tests/unit/Makefile.am | 2+-
Msrc/tests/unit/unit_md5.c | 590+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 580 insertions(+), 15 deletions(-)

diff --git a/src/tests/mhdt_checks.h b/src/tests/mhdt_checks.h @@ -1082,6 +1082,9 @@ MHDT_check_strn (size_t result_len, __FILE__, __LINE__, MHD_FUNC_, \ desc) + + + #if defined(_MSC_VER) /* Restore warnings */ #pragma warning(pop) diff --git a/src/tests/unit/Makefile.am b/src/tests/unit/Makefile.am @@ -69,7 +69,7 @@ unit_md5_SOURCES = unit_md5.c if MHD_MD5_EXTR if MHD_SUPPORT_OPENSSL unit_md5_LDFLAGS = $(OPENSSL_LDFLAGS) -unit_md5_LDADD = $(OPENSSL_LDFLAGS) +unit_md5_LDADD = $(OPENSSL_LIBS) else if MHD_SUPPORT_GNUTLS unit_md5_LDFLAGS = $(GNUTLS_LDFLAGS) diff --git a/src/tests/unit/unit_md5.c b/src/tests/unit/unit_md5.c @@ -38,8 +38,8 @@ /** * @file src/test/unit/unit_md5.c - * @brief The tests for MD5 - * @author Christian Grothoff + * @brief Unit tests for md5 functions + * @author Karlson2k (Evgeny Grin) */ #include <stdio.h> @@ -49,18 +49,53 @@ #include "mhd_sys_options.h" -#if MHD_MD5_EXTR_GNUTLS +#if MHD_MD5_EXTR_OPENSSL +#include "../mhd2/md5_ext_openssl.c" +#elif MHD_MD5_EXTR_GNUTLS #include "../mhd2/md5_ext_gnutls.c" #elif MHD_MD5_EXTR_MBEDTLS #include "../mhd2/md5_ext_mbedtls.c" -#elif MHD_MD5_EXTR_OPENSSL -#include "../mhd2/md5_ext_openssl.c" #else #include "../mhd2/md5_int.c" #endif #include "../mhd2/mhd_md5.h" +#define MD5_DIGEST_STRING_SIZE (mhd_MD5_DIGEST_SIZE * 2 + 1) + +/** + * Verbose output? + */ +static int verbose; + + + +/** + * Check whether one of strings in array is equal to @a param. + * String @a argv[0] is ignored. + * @param argc number of strings in @a argv, as passed to main function + * @param argv array of strings, as passed to main function + * @param param parameter to look for. + * @return zero if @a argv is NULL, @a param is NULL or empty string, + * @a argc is less then 2 or @a param is not found in @a argv, + * non-zero if one of strings in @a argv is equal to @a param. + */ +static int +has_param (int argc, char *const argv[], const char *param) +{ + int i; + if (! argv || ! param || ! param[0]) + return 0; + + for (i = 1; i < argc; i++) + { + if (argv[i] && (strcmp (argv[i], param) == 0) ) + return ! 0; + } + + return 0; +} + /* Define to 1 if libmicrohttpd is compiled with MD5 hashing by OpenSSL. */ /* #undef MHD_MD5_EXTR_OPENSSL */ @@ -85,6 +120,515 @@ hex2bin (const char *hex, } + +/* + * Helper functions + */ + +/** + * Print bin as hex + * + * @param bin binary data + * @param len number of bytes in bin + * @param hex pointer to len*2+1 bytes buffer + */ +static void +bin2hex (const uint8_t *bin, + size_t len, + char *hex) +{ + while (len-- > 0) + { + unsigned int b1, b2; + b1 = (*bin >> 4) & 0xf; + *hex++ = (char) ((b1 > 9) ? (b1 + 'A' - 10) : (b1 + '0')); + b2 = *bin++ & 0xf; + *hex++ = (char) ((b2 > 9) ? (b2 + 'A' - 10) : (b2 + '0')); + } + *hex = 0; +} + + +static int +check_result (const char *test_name, + unsigned int check_num, + const uint8_t calculated[mhd_MD5_DIGEST_SIZE], + const uint8_t expected[mhd_MD5_DIGEST_SIZE]) +{ + int failed = memcmp (calculated, + expected, + mhd_MD5_DIGEST_SIZE); + + check_num++; /* Print 1-based numbers */ + if (failed) + { + char calc_str[MD5_DIGEST_STRING_SIZE]; + char expc_str[MD5_DIGEST_STRING_SIZE]; + + bin2hex (calculated, + mhd_MD5_DIGEST_SIZE, + calc_str); + bin2hex (expected, + mhd_MD5_DIGEST_SIZE, + expc_str); + fprintf (stderr, + "FAILED: %s check %u: calculated digest %s, expected digest %s.\n", + test_name, + check_num, + calc_str, + expc_str); + fflush (stderr); + return 1; + } + if (verbose) + { + char calc_str[MD5_DIGEST_STRING_SIZE]; + + bin2hex (calculated, + mhd_MD5_DIGEST_SIZE, + calc_str); + fprintf (stderr, + "PASSED: %s check %u: calculated digest %s " + "matches expected digest.\n", + test_name, + check_num, + calc_str); + fflush (stdout); + } + return 0; +} + + +struct str_with_len +{ + const char *const str; + const size_t len; +}; + +#define D_STR_W_LEN(s) {(s), (sizeof((s)) / sizeof(char)) - 1} + +struct data_unit1 +{ + const struct str_with_len str_l; + const uint8_t digest[mhd_MD5_DIGEST_SIZE]; +}; + + +static const struct data_unit1 data_units1[] = { + {D_STR_W_LEN ("1234567890!@~%&$@#{}[]\\/!?`."), + {0x1c, 0x68, 0xc2, 0xe5, 0x1f, 0x63, 0xc9, 0x5f, 0x17, 0xab, 0x1f, 0x20, + 0x8b, 0x86, 0x39, 0x57}}, + {D_STR_W_LEN ("Simple string."), + {0xf1, 0x2b, 0x7c, 0xad, 0xa0, 0x41, 0xfe, 0xde, 0x4e, 0x68, 0x16, 0x63, + 0xb4, 0x60, 0x5d, 0x78}}, + {D_STR_W_LEN ("abcdefghijklmnopqrstuvwxyz"), + {0xc3, 0xfc, 0xd3, 0xd7, 0x61, 0x92, 0xe4, 0x00, 0x7d, 0xfb, 0x49, 0x6c, + 0xca, 0x67, 0xe1, 0x3b}}, + {D_STR_W_LEN ("zyxwvutsrqponMLKJIHGFEDCBA"), + {0x05, 0x61, 0x3a, 0x6b, 0xde, 0x75, 0x3a, 0x45, 0x91, 0xa8, 0x81, 0xb0, + 0xa7, 0xe2, 0xe2, 0x0e}}, + {D_STR_W_LEN ("abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA" \ + "abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"), + {0xaf, 0xab, 0xc7, 0xe9, 0xe7, 0x17, 0xbe, 0xd6, 0xc0, 0x0f, 0x78, 0x8c, + 0xde, 0xdd, 0x11, 0xd1}}, + {D_STR_W_LEN ("/long/long/long/long/long/long/long/long/long/long/long" \ + "/long/long/long/long/long/long/long/long/long/long/long" \ + "/long/long/long/long/long/long/long/long/long/long/long" \ + "/long/long/long/long/long/long/long/long/long/long/long" \ + "/long/long/long/long/long/long/long/long/long/long/long" \ + "/long/long/long/long/long/long/long/long/long/long/long" \ + "/long/long/long/long/path?with%20some=parameters"), + {0x7e, 0xe6, 0xdb, 0xe2, 0x76, 0x49, 0x1a, 0xd8, 0xaf, 0xf3, 0x52, 0x2d, + 0xd8, 0xfc, 0x89, 0x1e}}, + {D_STR_W_LEN (""), + {0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04, 0xe9, 0x80, 0x09, 0x98, + 0xec, 0xf8, 0x42, 0x7e}}, + {D_STR_W_LEN ("a"), + {0x0c, 0xc1, 0x75, 0xb9, 0xc0, 0xf1, 0xb6, 0xa8, 0x31, 0xc3, 0x99, 0xe2, + 0x69, 0x77, 0x26, 0x61}}, + {D_STR_W_LEN ("abc"), + {0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, + 0x28, 0xe1, 0x7f, 0x72}}, + {D_STR_W_LEN ("message digest"), + {0xf9, 0x6b, 0x69, 0x7d, 0x7c, 0xb7, 0x93, 0x8d, 0x52, 0x5a, 0x2f, 0x31, + 0xaa, 0xf1, 0x61, 0xd0}}, + {D_STR_W_LEN ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \ + "0123456789"), + {0xd1, 0x74, 0xab, 0x98, 0xd2, 0x77, 0xd9, 0xf5, 0xa5, 0x61, 0x1c, 0x2c, + 0x9f, 0x41, 0x9d, 0x9f}}, + {D_STR_W_LEN ("12345678901234567890123456789012345678901234567890" \ + "123456789012345678901234567890"), + {0x57, 0xed, 0xf4, 0xa2, 0x2b, 0xe3, 0xc9, 0x55, 0xac, 0x49, 0xda, 0x2e, + 0x21, 0x07, 0xb6, 0x7a}} +}; + +static const size_t units1_num = sizeof(data_units1) / sizeof(data_units1[0]); + +/* Calculated MD5 as one pass for whole data */ +static int +test1_str (void) +{ + unsigned int i; + int num_failed = 0; + struct mhd_Md5Ctx ctx; + + mhd_MD5_init_one_time (&ctx); + for (i = 0; i < units1_num; i++) + { + uint8_t digest[mhd_MD5_DIGEST_SIZE]; + + mhd_MD5_update (&ctx, + data_units1[i].str_l.len, + (const uint8_t *) data_units1[i].str_l.str); + mhd_MD5_finish_reset (&ctx, + digest); + if (mhd_MD5_has_err (&ctx)) + { + fprintf (stderr, + "External hashing error: %d.\n", + ctx.ext_error); + exit (99); + } + num_failed += check_result (MHD_FUNC_, + i, + digest, + data_units1[i].digest); + } + mhd_MD5_deinit (&ctx); + return num_failed; +} + + +struct bin_with_len +{ + const uint8_t bin[512]; + const size_t len; +}; + +struct data_unit2 +{ + const struct bin_with_len bin_l; + const uint8_t digest[mhd_MD5_DIGEST_SIZE]; +}; + + +static const struct data_unit2 data_units2[] = { + { { {97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, + 117, 118, 119, 120, 121, 122}, 26}, /* a..z ASCII sequence */ + {0xc3, 0xfc, 0xd3, 0xd7, 0x61, 0x92, 0xe4, 0x00, 0x7d, 0xfb, 0x49, 0x6c, + 0xca, 0x67, 0xe1, 0x3b}}, + { { {65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65}, 72 },/* 'A' x 72 times */ + {0x24, 0xa5, 0xef, 0x36, 0x82, 0x80, 0x3a, 0x06, 0x2f, 0xea, 0xad, 0xad, + 0x76, 0xda, 0xbd, 0xa8}}, + { { {19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73}, 55}, /* 19..73 sequence */ + {0x6d, 0x2e, 0x6e, 0xde, 0x5d, 0x64, 0x6a, 0x17, 0xf1, 0x09, 0x2c, 0xac, + 0x19, 0x10, 0xe3, 0xd6}}, + { { {7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69}, 63}, /* 7..69 sequence */ + {0x88, 0x13, 0x48, 0x47, 0x73, 0xaa, 0x92, 0xf2, 0xc9, 0xdd, 0x69, 0xb3, + 0xac, 0xf4, 0xba, 0x6e}}, + { { {38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92}, 55}, /* 38..92 sequence */ + {0x80, 0xf0, 0x05, 0x7e, 0xa2, 0xf7, 0xc8, 0x43, 0x12, 0xd3, 0xb1, 0x61, + 0xab, 0x52, 0x3b, 0xaf}}, + { { {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72}, + 72},/* 1..72 sequence */ + {0xc3, 0x28, 0xc5, 0xad, 0xc9, 0x26, 0xa9, 0x99, 0x95, 0x4a, 0x5e, 0x25, + 0x50, 0x34, 0x51, 0x73}}, + { { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, + 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, + 235, 236, 237, 238, 239, 240, + 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, + 255}, 256}, /* 0..255 sequence */ + {0xe2, 0xc8, 0x65, 0xdb, 0x41, 0x62, 0xbe, 0xd9, 0x63, 0xbf, 0xaa, 0x9e, + 0xf6, 0xac, 0x18, 0xf0}}, + { { {199, 198, 197, 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, 186, + 185, 184, 183, 182, 181, 180, + 179, 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, + 165, 164, 163, 162, 161, 160, + 159, 158, 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, + 145, 144, 143, 142, 141, 140, + 139}, 61}, /* 199..139 sequence */ + {0xbb, 0x3f, 0xdb, 0x4a, 0x96, 0x03, 0x36, 0x37, 0x38, 0x78, 0x5e, 0x44, + 0xbf, 0x3a, 0x85, 0x51}}, + { { {255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, + 241, 240, 239, 238, 237, 236, + 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, 222, + 221, 220, 219, 218, 217, 216, + 215, 214, 213, 212, 211, 210, 209, 208, 207, 206, 205, 204, 203, 202, + 201, 200, 199, 198, 197, 196, + 195, 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, 182, + 181, 180, 179, 178, 177, 176, + 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, 163, 162, + 161, 160, 159, 158, 157, 156, + 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, 144, 143, 142, + 141, 140, 139, 138, 137, 136, + 135, 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, 123, 122, + 121, 120, 119, 118, 117, 116, + 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, + 101, 100, 99, 98, 97, 96, 95, + 94, 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, + 76, 75, 74, 73, 72, 71, 70, + 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, + 51, 50, 49, 48, 47, 46, 45, + 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, + 26, 25, 24, 23, 22, 21, 20, + 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}, 255}, /* 255..1 sequence */ + {0x52, 0x21, 0xa5, 0x83, 0x4f, 0x38, 0x7c, 0x73, 0xba, 0x18, 0x22, 0xb1, + 0xf9, 0x7e, 0xae, 0x8b}}, + { { {41, 35, 190, 132, 225, 108, 214, 174, 82, 144, 73, 241, 241, 187, 233, + 235, 179, 166, 219, 60, 135, + 12, 62, 153, 36, 94, 13, 28, 6, 183, 71, 222, 179, 18, 77, 200, 67, 187, + 139, 166, 31, 3, 90, 125, 9, + 56, 37, 31, 93, 212, 203, 252, 150, 245, 69, 59, 19, 13, 137, 10, 28, + 219, 174, 50, 32, 154, 80, 238, + 64, 120, 54, 253, 18, 73, 50, 246, 158, 125, 73, 220, 173, 79, 20, 242, + 68, 64, 102, 208, 107, 196, + 48, 183, 50, 59, 161, 34, 246, 34, 145, 157, 225, 139, 31, 218, 176, 202, + 153, 2, 185, 114, 157, 73, + 44, 128, 126, 197, 153, 213, 233, 128, 178, 234, 201, 204, 83, 191, 103, + 214, 191, 20, 214, 126, 45, + 220, 142, 102, 131, 239, 87, 73, 97, 255, 105, 143, 97, 205, 209, 30, + 157, 156, 22, 114, 114, 230, + 29, 240, 132, 79, 74, 119, 2, 215, 232, 57, 44, 83, 203, 201, 18, 30, 51, + 116, 158, 12, 244, 213, + 212, 159, 212, 164, 89, 126, 53, 207, 50, 34, 244, 204, 207, 211, 144, + 45, 72, 211, 143, 117, 230, + 217, 29, 42, 229, 192, 247, 43, 120, 129, 135, 68, 14, 95, 80, 0, 212, + 97, 141, 190, 123, 5, 21, 7, + 59, 51, 130, 31, 24, 112, 146, 218, 100, 84, 206, 177, 133, 62, 105, 21, + 248, 70, 106, 4, 150, 115, + 14, 217, 22, 47, 103, 104, 212, 247, 74, 74, 208, 87, 104}, 255}, /* pseudo-random data */ + {0x55, 0x61, 0x2c, 0xeb, 0x29, 0xee, 0xa8, 0xb2, 0xf6, 0x10, 0x7b, 0xc1, + 0x5b, 0x0f, 0x01, 0x95}} +}; +static const size_t units2_num = sizeof(data_units2) / sizeof(data_units2[0]); + + +static int +test1_bin (void) +{ + unsigned int i; + int num_failed = 0; + struct mhd_Md5Ctx ctx; + + mhd_MD5_init_one_time (&ctx); + for (i = 0; i < units2_num; i++) + { + uint8_t digest[mhd_MD5_DIGEST_SIZE]; + + mhd_MD5_update (&ctx, + data_units2[i].bin_l.len, + data_units2[i].bin_l.bin); + mhd_MD5_finish_reset (&ctx, + digest); + if (mhd_MD5_has_err (&ctx)) + { + fprintf (stderr, + "External hashing error: %d.\n", + ctx.ext_error); + exit (99); + } + num_failed += check_result (MHD_FUNC_, + i, + digest, + data_units2[i].digest); + } + mhd_MD5_deinit (&ctx); + return num_failed; +} + + +/* Calculated MD5 as two iterations for whole data */ +static int +test2_str (void) +{ + unsigned int i; + int num_failed = 0; + struct mhd_Md5Ctx ctx; + + mhd_MD5_init_one_time (&ctx); + for (i = 0; i < units1_num; i++) + { + uint8_t digest[mhd_MD5_DIGEST_SIZE]; + size_t part_s = data_units1[i].str_l.len / 4; + + mhd_MD5_update (&ctx, + 0, + (const uint8_t *) ""); + mhd_MD5_update (&ctx, + part_s, + (const uint8_t *) data_units1[i].str_l.str); + mhd_MD5_update (&ctx, + 0, + (const uint8_t *) ""); + mhd_MD5_update (&ctx, + data_units1[i].str_l.len - part_s, + (const uint8_t *) data_units1[i].str_l.str + part_s); + mhd_MD5_update (&ctx, + 0, + (const uint8_t *) ""); + mhd_MD5_finish_reset (&ctx, + digest); + if (mhd_MD5_has_err (&ctx)) + { + fprintf (stderr, + "External hashing error: %d.\n", + ctx.ext_error); + exit (99); + } + num_failed += check_result (MHD_FUNC_, + i, + digest, + data_units1[i].digest); + } + mhd_MD5_deinit (&ctx); + return num_failed; +} + + +static int +test2_bin (void) +{ + unsigned int i; + int num_failed = 0; + struct mhd_Md5Ctx ctx; + + mhd_MD5_init_one_time (&ctx); + + for (i = 0; i < units2_num; i++) + { + uint8_t digest[mhd_MD5_DIGEST_SIZE]; + size_t part_s = data_units2[i].bin_l.len * 2 / 3; + + mhd_MD5_update (&ctx, + part_s, + data_units2[i].bin_l.bin); + mhd_MD5_update (&ctx, + 0, + (const uint8_t *) ""); + mhd_MD5_update (&ctx, + data_units2[i].bin_l.len - part_s, + data_units2[i].bin_l.bin + part_s); + mhd_MD5_finish_reset (&ctx, + digest); + if (mhd_MD5_has_err (&ctx)) + { + fprintf (stderr, + "External hashing error: %d.\n", + ctx.ext_error); + exit (99); + } + num_failed += check_result (MHD_FUNC_, + i, + digest, + data_units2[i].digest); + } + mhd_MD5_deinit (&ctx); + return num_failed; +} + + +/* Use data set number 7 as it has the longest sequence */ +#define DATA_POS 6 +#define MAX_OFFSET 31 + +static int +test_unaligned (void) +{ + const struct data_unit2 *const tdata = data_units2 + DATA_POS; + int num_failed = 0; + unsigned int offset; + uint8_t *buf; + uint8_t *digest_buf; + struct mhd_Md5Ctx ctx; + + buf = malloc (tdata->bin_l.len + MAX_OFFSET); + digest_buf = malloc (mhd_MD5_DIGEST_SIZE + MAX_OFFSET); + if ( (NULL == buf) || + (NULL == digest_buf) ) + exit (99); + + mhd_MD5_init_one_time (&ctx); + + for (offset = MAX_OFFSET; offset >= 1; --offset) + { + uint8_t *unaligned_digest; + uint8_t *unaligned_buf; + + unaligned_buf = buf + offset; + memcpy (unaligned_buf, + tdata->bin_l.bin, + tdata->bin_l.len); + unaligned_digest = digest_buf + MAX_OFFSET - offset; + memset (unaligned_digest, + 0, + mhd_MD5_DIGEST_SIZE); + mhd_MD5_update (&ctx, + tdata->bin_l.len, + unaligned_buf); + mhd_MD5_finish_reset (&ctx, + unaligned_digest); + if (mhd_MD5_has_err (&ctx)) + { + fprintf (stderr, + "External hashing error: %d.\n", + ctx.ext_error); + exit (99); + } + num_failed += check_result (MHD_FUNC_, + MAX_OFFSET - offset, + unaligned_digest, + tdata->digest); + } + mhd_MD5_deinit (&ctx); + free (digest_buf); + free (buf); + return num_failed; +} + + + /* Helper function to compare digest with expected hex string */ static int check_digest (const uint8_t *digest, @@ -127,7 +671,8 @@ check_digest (const uint8_t *digest, int -main (void) +main (int argc, + char **argv) { struct Test { @@ -176,7 +721,11 @@ main (void) size_t data_len; unsigned int passed = 0; unsigned int total = 0; + unsigned int num_failed; + if (has_param (argc, argv, "-v") || + has_param (argc, argv, "--verbose")) + verbose = 1; while (NULL != tests[total].name) { const struct Test *t = &tests[total]; @@ -223,12 +772,19 @@ main (void) if (! mhd_MD5_has_err (&ctx)) { data[0] = 'a'; - mhd_MD5_update (&ctx, 1, data); + mhd_MD5_update (&ctx, + 1, + data); data[0] = 'b'; - mhd_MD5_update (&ctx, 1, data); + mhd_MD5_update (&ctx, + 1, + data); data[0] = 'c'; - mhd_MD5_update (&ctx, 1, data); - mhd_MD5_finish_deinit (&ctx, digest); + mhd_MD5_update (&ctx, + 1, + data); + mhd_MD5_finish_deinit (&ctx, + digest); if (! mhd_MD5_has_err (&ctx)) { if (check_digest (digest, @@ -268,9 +824,15 @@ main (void) } } - printf ("Results: %d/%d tests passed\n", - passed, - total); + num_failed = total - passed; + num_failed += test1_str (); + num_failed += test1_bin (); + num_failed += test2_str (); + num_failed += test2_bin (); + num_failed += test_unaligned (); + + printf ("Results: %u tests failed\n", + num_failed); - return (passed == total) ? 0 : 1; + return (0 == num_failed) ? 0 : 1; }