From e379ba90cf8e94ce176c8b49be5e36f9ec444795 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen Date: Mon, 24 Mar 2014 09:48:01 +0100 Subject: [PATCH] replaced md5 by sha1 checksumming --- include/libpsl-inline.h | 5 +++-- src/psl-inline.c | 6 +++--- src/psl2c.c | 4 ++-- tests/test-is-public-inline.c | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/libpsl-inline.h b/include/libpsl-inline.h index 6012395..d4ad50f 100644 --- a/include/libpsl-inline.h +++ b/include/libpsl-inline.h @@ -68,9 +68,10 @@ time_t // returns mtime of PSL source file time_t psl_inline_builtin_file_time(void); -// returns MD5 checksum of PSL source file + +// returns MD5 checksum (hex-encoded, lowercase) of PSL source file const char * - psl_inline_builtin_md5sum(void); + psl_inline_builtin_sha1sum(void); PSL_END_DECLS diff --git a/src/psl-inline.c b/src/psl-inline.c index 3002e08..51600d9 100644 --- a/src/psl-inline.c +++ b/src/psl-inline.c @@ -159,8 +159,8 @@ time_t psl_inline_builtin_file_time(void) return _psl_file_time; } -// returns MD5 checksum of PSL source file -const char *psl_inline_builtin_md5sum(void) +// returns MD5 checksum (hex-encoded, lowercase) of PSL source file +const char *psl_inline_builtin_sha1sum(void) { - return _psl_md5_checksum; + return _psl_sha1_checksum; } diff --git a/src/psl2c.c b/src/psl2c.c index 8c9ce0d..5672fa7 100644 --- a/src/psl2c.c +++ b/src/psl2c.c @@ -114,7 +114,7 @@ int main(int argc, const char **argv) _print_psl_entries(fpout, psl->suffixes, "suffixes"); _print_psl_entries(fpout, psl->suffix_exceptions, "suffix_exceptions"); - snprintf(cmd, sizeof(cmd), "md5sum %s", argv[1]); + snprintf(cmd, sizeof(cmd), "sha1sum %s", argv[1]); if ((pp = popen(cmd, "r"))) { if (fscanf(pp, "%63[0-9a-zA-Z]", checksum) < 1) *checksum = 0; @@ -125,7 +125,7 @@ int main(int argc, const char **argv) st.st_mtime = 0; fprintf(fpout, "static time_t _psl_file_time = %lu;\n", st.st_mtime); fprintf(fpout, "static time_t _psl_compile_time = %lu;\n", time(NULL)); - fprintf(fpout, "static char _psl_md5_checksum[] = \"%s\";\n", checksum); + fprintf(fpout, "static char _psl_sha1_checksum[] = \"%s\";\n", checksum); if (fclose(fpout) != 0) ret = 4; diff --git a/tests/test-is-public-inline.c b/tests/test-is-public-inline.c index 0af7915..56afe41 100644 --- a/tests/test-is-public-inline.c +++ b/tests/test-is-public-inline.c @@ -89,8 +89,8 @@ static void test_psl(void) printf("psl_builtin_file_time()=%ld\n", psl_inline_builtin_file_time()); psl_inline_builtin_file_time() == 0 ? failed++ : ok++; - printf("psl_builtin_md5sum()=%s\n", psl_inline_builtin_md5sum()); - *psl_inline_builtin_md5sum() == 0 ? failed++ : ok++; + printf("psl_builtin_sha1sum()=%s\n", psl_inline_builtin_sha1sum()); + *psl_inline_builtin_sha1sum() == 0 ? failed++ : ok++; psl_inline_deinit(); }