initial cleanup of unused parts of ltc

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index aad20b6ec1209d91ee6e49478b320ceb77244047..ba2c95f69fd42b913068a4766c0813c1d7b939ac 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))
 
@@ -364,16 +364,9 @@ tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ))
 
 LTCOBJ= \
    ciphers/aes/aes.o \
-   ciphers/anubis.o \
    ciphers/blowfish.o \
-   ciphers/camellia.o \
    ciphers/cast5.o \
    ciphers/des.o \
-   ciphers/kasumi.o \
-   ciphers/khazad.o \
-   ciphers/kseed.o \
-   ciphers/multi2.o \
-   ciphers/noekeon.o \
    ciphers/rc2.o \
    ciphers/rc5.o \
    ciphers/rc6.o \
@@ -452,9 +445,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 \
@@ -468,7 +458,6 @@ LTCOBJ= \
    hashes/sha2/sha512_256.o \
    hashes/sha3.o \
    hashes/sha3_test.o \
-   hashes/tiger.o \
    hashes/whirl/whirl.o \
    mac/blake2/blake2bmac.o \
    mac/blake2/blake2bmac_file.o \
@@ -480,13 +469,6 @@ LTCOBJ= \
    mac/blake2/blake2smac_memory.o \
    mac/blake2/blake2smac_memory_multi.o \
    mac/blake2/blake2smac_test.o \
-   mac/f9/f9_done.o \
-   mac/f9/f9_file.o \
-   mac/f9/f9_init.o \
-   mac/f9/f9_memory.o \
-   mac/f9/f9_memory_multi.o \
-   mac/f9/f9_process.o \
-   mac/f9/f9_test.o \
    mac/hmac/hmac_done.o \
    mac/hmac/hmac_file.o \
    mac/hmac/hmac_init.o \
@@ -721,13 +703,6 @@ LTCOBJ= \
    pk/ecc/ltc_ecc_points.o \
    pk/ecc/ltc_ecc_projective_add_point.o \
    pk/ecc/ltc_ecc_projective_dbl_point.o \
-   pk/katja/katja_decrypt_key.o \
-   pk/katja/katja_encrypt_key.o \
-   pk/katja/katja_export.o \
-   pk/katja/katja_exptmod.o \
-   pk/katja/katja_free.o \
-   pk/katja/katja_import.o \
-   pk/katja/katja_make_key.o \
    pk/pkcs1/pkcs_1_i2osp.o \
    pk/pkcs1/pkcs_1_mgf1.o \
    pk/pkcs1/pkcs_1_oaep_decode.o \
@@ -756,7 +731,6 @@ LTCOBJ= \
    prngs/rc4.o \
    prngs/rng_get_bytes.o \
    prngs/rng_make_prng.o \
-   prngs/sober128.o \
    prngs/sprng.o \
    prngs/yarrow.o \
    stream/chacha/chacha_crypt.o \
@@ -767,11 +741,14 @@ LTCOBJ= \
    stream/chacha/chacha_setup.o \
    stream/chacha/chacha_test.o \
    stream/rc4/rc4_stream.o \
-   stream/rc4/rc4_test.o \
-   stream/sober128/sober128_stream.o \
-   stream/sober128/sober128_test.o
+   stream/rc4/rc4_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 +781,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 \