aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@member.fsf.org>2017-10-15 20:35:03 +0200
committerGitHub <noreply@github.com>2017-10-15 20:35:03 +0200
commit22def554ae1f073ea51d000b01bc08b4010e677d (patch)
tree264fc3f891999dfa0f90e3e98e4673ed6d948c76
parentFix dependencies in makefile (diff)
parentMakefile: use "rm -f" upon cleaning and uninstalling (diff)
downloadsha3sum-22def554ae1f073ea51d000b01bc08b4010e677d.tar.gz
sha3sum-22def554ae1f073ea51d000b01bc08b4010e677d.tar.bz2
sha3sum-22def554ae1f073ea51d000b01bc08b4010e677d.tar.xz
Merge pull request #21 from thebombzen/master
Two minor fixes
-rw-r--r--Makefile9
-rwxr-xr-xtest2
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index c32e80c..fce9bfe 100644
--- a/Makefile
+++ b/Makefile
@@ -73,13 +73,12 @@ install: $(BIN) $(MAN1)
cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum/"
uninstall:
- -cd -- "$(DESTDIR)$(PREFIX)/bin" && rm -- $(BIN)
- -cd -- "$(DESTDIR)$(MANPREFIX)/man1" && rm -- $(MAN1)
- -rm -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum/LICENSE"
- -rmdir -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum"
+ -cd -- "$(DESTDIR)$(PREFIX)/bin" && rm -f -- $(BIN)
+ -cd -- "$(DESTDIR)$(MANPREFIX)/man1" && rm -f -- $(MAN1)
+ -rm -rf -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum"
clean:
- -rm -r -- $(MAN1) $(BIN) keccak-*sum.c sha3-*sum.c rawshake*sum.c shake*sum.c .testdir
+ -rm -rf -- $(MAN1) $(BIN) keccak-*sum.c sha3-*sum.c rawshake*sum.c shake*sum.c .testdir
.SUFFIXES:
diff --git a/test b/test
index 3442e0d..11caa5d 100755
--- a/test
+++ b/test
@@ -24,7 +24,7 @@ test "$(printf '' | ./keccak-512sum)" = '0EAB42DE4C3CEB9235FC91ACFFE746B29C29A8C
test "$(printf '' | ./sha3-224sum -u)" = '6B4E03423667DBB73B6E15454F0EB1ABD4597F9A1B078E3F5B5A6BC7 -'
test "$(printf '' | ./sha3-224sum -l)" = '6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7 -'
-test "$(printf '' | ./sha3-224sum -b)" = "$(printf '\x6B\x4E\x03\x42\x36\x67\xDB\xB7\x3B\x6E\x15\x45\x4F\x0E\xB1\xAB\xD4\x59\x7F\x9A\x1B\x07\x8E\x3F\x5B\x5A\x6B\xC7')"
+test "$(printf '' | ./sha3-224sum -b)" = "$(printf '\153\116\003\102\066\147\333\267\073\156\025\105\117\016\261\253\324\131\177\232\033\007\216\077\133\132\153\307')"
test "$(printf '' | ./rawshake256sum -N 128)" = '3A1108D4A90A31B85A10BDCE77F4BFBD -'