From b73bcec311b10f7f622058b8b0c2bef428790686 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 15 Oct 2017 15:30:55 +0200 Subject: Fix dependencies in makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 1 - Makefile | 6 ++-- xsum.1 | 98 -------------------------------------------------------------- xsum.man | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 102 deletions(-) delete mode 100644 xsum.1 create mode 100644 xsum.man diff --git a/.gitignore b/.gitignore index cd1e936..667ce2c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ *.o *.su *.1 -!/xsum.1 /*sum /keccak-*sum.c /sha3-*sum.c diff --git a/Makefile b/Makefile index 3e622cf..c32e80c 100644 --- a/Makefile +++ b/Makefile @@ -45,9 +45,9 @@ all: $(BIN) $(MAN1) %.o: %.c $(HDR) $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) -%.1: xsum.1 +%.1: xsum.man u=$$(printf '%s\n' $* | tr a-z A-Z); \ - sed -e 's/xsum/$*/g' -e 's/XSUM/'"$$u"'/g' -e 's/Xsum/$($*)/g' < xsum.1 > $@ + sed -e 's/xsum/$*/g' -e 's/XSUM/'"$$u"'/g' -e 's/Xsum/$($*)/g' < xsum.man > $@ keccak-%sum.c: printf '%s\n' '#include "common.h"' 'KECCAK_MAIN($*)' > $@ @@ -64,7 +64,7 @@ shake%sum.c: check: ./test -install: +install: $(BIN) $(MAN1) mkdir -p -- "$(DESTDIR)$(PREFIX)/bin" mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man1" mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum" diff --git a/xsum.1 b/xsum.1 deleted file mode 100644 index bd7c64f..0000000 --- a/xsum.1 +++ /dev/null @@ -1,98 +0,0 @@ -.TH XSUM 1 sha3sum -.SH NAME -xsum - Compute and check Xsum message digests -.SH SYNOPSIS -.B xsum -[-u | -l | -b | -c] -[-R -.IR rate ] -[-C -.IR capacity ] -[-N -.IR output-size ] -[-S -.IR state-size ] -[-W -.IR word-size ] -[-Z -.IR squeeze-count ] -[-vx] -.RI [ file \ ...] -.SH DESCRIPTION -Print or check Xsum checksums. If no file -or when the file is -, read standard input. -.TP -.B -u -Output checksums in upper-case hexadecimal representation. (default) -.TP -.B -l -Output checksums in lower-case hexadecimal representation. -.TP -.B -b -Output checksums in binary representation. This suppresses -the filenames and checksum delimiters. Only the checksums -are printed. -.TP -.B -c -Read Xsum sums from the file and check them against -the files on your systems. The input files files -should be formated as the output of this program, or -similarly. This is not going to work if any of the -filenames in the input files starts with a regular -blank space or horizontal tab space, or if they -contain a line feed, carriage return or form feed. -.TP -.B -x -Convert input files from hexadecimal for to binary form -before calculating the checksums. -.TP -.B -v -Print the hashing parameters. -.P -The following options change the hashing parameters: -.TP -.BI -R\ rate -Change the rate. -.TP -.BI -C\ capacity -Change the capacity. -.TP -.BR -N ,\ -O \ \fIoutput-size\fP -Change the output size. -.TP -.BR -S ,\ -B \ \fIstate-size\fP -Change the state size. -.TP -.BI -W\ word-size -Change the word size. -.TP -.BI -Z\ squeeze-count -Change the number of squeezes that is performed. -.SH EXIT STATUS -.TP -0 -Successful completion. -.TP -1 -Checksums did not match or a file did not exist. -.TP -2 -An error occurrsed. -.SH AUTHORS -Mattias Andrée -.RI < maandree@kth.se > -.SH NOTES -All commands in the sha3sum package allow changing -the hashing parameters. However it is only intended -to be used with -.BR keccaksum (1), -or if you know what you are doing; apart from -.B -N -which is intended to -.I always -be used with -.BR shake256sum (1), -.BR shake512sum (1), -.BR rawshake256sum (1), -and -.BR rawshake512sum (1). diff --git a/xsum.man b/xsum.man new file mode 100644 index 0000000..bd7c64f --- /dev/null +++ b/xsum.man @@ -0,0 +1,98 @@ +.TH XSUM 1 sha3sum +.SH NAME +xsum - Compute and check Xsum message digests +.SH SYNOPSIS +.B xsum +[-u | -l | -b | -c] +[-R +.IR rate ] +[-C +.IR capacity ] +[-N +.IR output-size ] +[-S +.IR state-size ] +[-W +.IR word-size ] +[-Z +.IR squeeze-count ] +[-vx] +.RI [ file \ ...] +.SH DESCRIPTION +Print or check Xsum checksums. If no file +or when the file is -, read standard input. +.TP +.B -u +Output checksums in upper-case hexadecimal representation. (default) +.TP +.B -l +Output checksums in lower-case hexadecimal representation. +.TP +.B -b +Output checksums in binary representation. This suppresses +the filenames and checksum delimiters. Only the checksums +are printed. +.TP +.B -c +Read Xsum sums from the file and check them against +the files on your systems. The input files files +should be formated as the output of this program, or +similarly. This is not going to work if any of the +filenames in the input files starts with a regular +blank space or horizontal tab space, or if they +contain a line feed, carriage return or form feed. +.TP +.B -x +Convert input files from hexadecimal for to binary form +before calculating the checksums. +.TP +.B -v +Print the hashing parameters. +.P +The following options change the hashing parameters: +.TP +.BI -R\ rate +Change the rate. +.TP +.BI -C\ capacity +Change the capacity. +.TP +.BR -N ,\ -O \ \fIoutput-size\fP +Change the output size. +.TP +.BR -S ,\ -B \ \fIstate-size\fP +Change the state size. +.TP +.BI -W\ word-size +Change the word size. +.TP +.BI -Z\ squeeze-count +Change the number of squeezes that is performed. +.SH EXIT STATUS +.TP +0 +Successful completion. +.TP +1 +Checksums did not match or a file did not exist. +.TP +2 +An error occurrsed. +.SH AUTHORS +Mattias Andrée +.RI < maandree@kth.se > +.SH NOTES +All commands in the sha3sum package allow changing +the hashing parameters. However it is only intended +to be used with +.BR keccaksum (1), +or if you know what you are doing; apart from +.B -N +which is intended to +.I always +be used with +.BR shake256sum (1), +.BR shake512sum (1), +.BR rawshake256sum (1), +and +.BR rawshake512sum (1). -- cgit v1.2.3-70-g09d2