remove md2 md4 md5 hashes

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index aad20b6ec1209d91ee6e49478b320ceb77244047..89ead077dae6cf50cf695adf34ff355ececf2a66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ JSWOBJ=$(JSWSRC:%.c=%.o)
 LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \
          foreach_path.c vercmp.c findpkg.c quote.c dbquery.c script_hash.c \
          parse.c integ.c seterror.c notes.c createpkg.c buffer.c \
-         blake2/ref/blake2b-ref.o
+         blake2b.c
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -452,9 +452,6 @@ LTCOBJ= \
    hashes/helper/hash_filehandle.o \
    hashes/helper/hash_memory.o \
    hashes/helper/hash_memory_multi.o \
-   hashes/md2.o \
-   hashes/md4.o \
-   hashes/md5.o \
    hashes/rmd128.o \
    hashes/rmd160.o \
    hashes/rmd256.o \
@@ -772,6 +769,11 @@ LTCOBJ= \
    stream/sober128/sober128_test.o
 
 libtomcrypt/%.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE
+libtomcrypt/%.o: CFLAGS+=-DLTC_EASY -DLTC_GCM_MODE
+
+tomclean:
+       rm -f $(addprefix libtomcrypt/src/, $(LTCOBJ))
+       rm -f ltc.o
 
 ltc.o: $(addprefix libtomcrypt/src/, $(LTCOBJ))
        ld -o $@ -r $+
@@ -804,7 +806,7 @@ crypto/libeddsa/lib/sc.c \
 crypto/libeddsa/lib/sha512.c \
 crypto/libeddsa/lib/x25519.c
 
-SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2/ref/blake2b-ref.o \
+SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2b.o \
        crypto/chacha.o
 
 $(SIGNOBJ): CFLAGS=-Wall -Wextra -W -Werror -Wno-pointer-sign \