diff options
| author | Pádraig Brady <P@draigBrady.com> | 2021-09-06 15:17:12 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2021-09-15 20:44:16 +0100 |
| commit | ad6c8e1181a3966e35d68c1c354deb1c73f3e974 (patch) | |
| tree | 43ec3b95effbbaa70ae782b79e6c2f26883590ea /src/local.mk | |
| parent | 6a5c561b4fb3018d284d03747c612527e0c89571 (diff) | |
| download | coreutils-ad6c8e1181a3966e35d68c1c354deb1c73f3e974.tar.gz | |
cksum: add --algorithm option to select digest mode
* src/digest.c: Organize HASH_ALGO_CKSUM to be table driven,
and amalgamate all digest algorithms.
(main): Parse all options if HASH_ALGO_CKSUM, and disallow
--tag, --zero, and --check with the traditional bsd, sysv, and crc
checksums for now.
* src/local.mk: Reorganize to include all digest modules in cksum.
* tests/misc/cksum-a.sh: Add a new test.
* tests/misc/b2sum.sh: Update to default to checking with cksum,
as b2sum's implementation diverges a bit from the others.
* tests/local.mk: Reference the new test.
* doc/coreutils.texi (cksum invocation): Adjust the summary to
identify the new mode, and document the new --algorithm option.
* man/cksum.x: Adjust description to be more general.
* man/*sum.x: Add [See Also] section referencing cksum(1).
* NEWS: Mention the new feature.
Diffstat (limited to 'src/local.mk')
| -rw-r--r-- | src/local.mk | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/local.mk b/src/local.mk index 54303d305..0c8b65d39 100644 --- a/src/local.mk +++ b/src/local.mk @@ -304,6 +304,7 @@ src_sha224sum_LDADD += $(LIB_CRYPTO) src_sha256sum_LDADD += $(LIB_CRYPTO) src_sha384sum_LDADD += $(LIB_CRYPTO) src_sha512sum_LDADD += $(LIB_CRYPTO) +src_cksum_LDADD += $(LIB_CRYPTO) # for canon_host src_pinky_LDADD += $(GETADDRINFO_LIB) @@ -355,18 +356,6 @@ src___SOURCES = src/lbracket.c nodist_src_coreutils_SOURCES = src/coreutils.h src_coreutils_SOURCES = src/coreutils.c -src_sum_SOURCES = src/sum.c src/sum.h src/digest.c -src_sum_CPPFLAGS = -DHASH_ALGO_SUM=1 $(AM_CPPFLAGS) - -src_cksum_SOURCES = src/cksum.c src/cksum.h src/crctab.c src/digest.c -src_cksum_CPPFLAGS = -DHASH_ALGO_CKSUM=1 $(AM_CPPFLAGS) -if USE_PCLMUL_CRC32 -noinst_LIBRARIES += src/libcksum_pclmul.a -src_libcksum_pclmul_a_SOURCES = src/cksum_pclmul.c src/cksum.h -cksum_pclmul_ldadd = src/libcksum_pclmul.a -src_cksum_LDADD += $(cksum_pclmul_ldadd) -src_libcksum_pclmul_a_CFLAGS = -mavx -mpclmul $(AM_CFLAGS) -endif src_cp_SOURCES = src/cp.c $(copy_sources) $(selinux_sources) src_dir_SOURCES = src/ls.c src/ls-dir.c src_env_SOURCES = src/env.c src/operand2sig.c @@ -401,6 +390,9 @@ src_arch_SOURCES = src/uname.c src/uname-arch.c src_cut_SOURCES = src/cut.c src/set-fields.c src_numfmt_SOURCES = src/numfmt.c src/set-fields.c +src_sum_SOURCES = src/sum.c src/sum.h src/digest.c +src_sum_CPPFLAGS = -DHASH_ALGO_SUM=1 $(AM_CPPFLAGS) + src_md5sum_SOURCES = src/digest.c src_md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS) src_sha1sum_SOURCES = src/digest.c @@ -419,6 +411,17 @@ src_b2sum_SOURCES = src/digest.c \ src/blake2/blake2b-ref.c \ src/blake2/b2sum.c src/blake2/b2sum.h +src_cksum_SOURCES = $(src_b2sum_SOURCES) src/sum.c src/sum.h \ + src/cksum.c src/cksum.h src/crctab.c +src_cksum_CPPFLAGS = -DHASH_ALGO_CKSUM=1 -DHAVE_CONFIG_H $(AM_CPPFLAGS) +if USE_PCLMUL_CRC32 +noinst_LIBRARIES += src/libcksum_pclmul.a +src_libcksum_pclmul_a_SOURCES = src/cksum_pclmul.c src/cksum.h +cksum_pclmul_ldadd = src/libcksum_pclmul.a +src_cksum_LDADD += $(cksum_pclmul_ldadd) +src_libcksum_pclmul_a_CFLAGS = -mavx -mpclmul $(AM_CFLAGS) +endif + src_base64_SOURCES = src/basenc.c src_base64_CPPFLAGS = -DBASE_TYPE=64 $(AM_CPPFLAGS) src_base32_SOURCES = src/basenc.c |