X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;fp=Makefile;h=1e24827a4de764a561ca2e693dbe1afe181b3066;hp=fc12c2c6144c462ef52966d56914208f4455fe53;hb=2a3d80be326e401f9008d695232fe5543c909d18;hpb=7955b22e032857bed284c22c5303c0a289b4bd71

diff --git a/Makefile b/Makefile
index fc12c2c..1e24827 100644
--- a/Makefile
+++ b/Makefile
@@ -366,15 +366,11 @@ LTCOBJ= \
    ciphers/aes/aes.o \
    ciphers/blowfish.o \
    ciphers/cast5.o \
-   ciphers/des.o \
    ciphers/rc2.o \
    ciphers/rc5.o \
    ciphers/rc6.o \
-   ciphers/safer/safer.o \
-   ciphers/safer/saferp.o \
    ciphers/skipjack.o \
    ciphers/twofish/twofish.o \
-   ciphers/xtea.o \
    encauth/ccm/ccm_add_aad.o \
    encauth/ccm/ccm_add_nonce.o \
    encauth/ccm/ccm_done.o \
@@ -720,7 +716,6 @@ LTCOBJ= \
    pk/rsa/rsa_verify_hash.o \
    prngs/chacha20.o \
    prngs/fortuna.o \
-   prngs/rc4.o \
    prngs/rng_get_bytes.o \
    prngs/rng_make_prng.o \
    prngs/sprng.o \
@@ -731,12 +726,45 @@ LTCOBJ= \
    stream/chacha/chacha_ivctr64.o \
    stream/chacha/chacha_keystream.o \
    stream/chacha/chacha_setup.o \
-   stream/chacha/chacha_test.o \
-   stream/rc4/rc4_stream.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
+   stream/chacha/chacha_test.o
+
+libtomcrypt/%.o: CFLAGS+= -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -Ilibtomcrypt/src/headers
+libtomcrypt/%.o: CFLAGS+= \
+	-DTFM_DESC \
+	-DTFM_NO_ASM \
+	-DLTC_NOTHING \
+	-DLTC_NO_ASM \
+	-DLTC_SOURCE \
+       	-DLTC_POLY1305 \
+       	-DLTC_CHACHA20POLY1305_MODE \
+	-DLTC_RIJNDAEL \
+	-DLTC_BLOWFISH \
+	-DLTC_CHACHA \
+	-DLTC_CAST5 \
+	-DLTC_ECB_MODE \
+	-DLTC_CBC_MODE \
+	-DLTC_CTR_MODE \
+	-DLTC_GCM_MODE \
+	-DLTC_SHA1 \
+	-DLTC_SHA3 \
+	-DLTC_SHA512 \
+	-DLTC_SHA384 \
+	-DLTC_SHA256 \
+	-DLTC_SHA224 \
+	-DLTC_HASH_HELPERS \
+	-DLTC_HMAC \
+	-DLTC_OMAC \
+	-DLTC_CCM_MODE \
+	-DLTC_SPRNG \
+	-DLTC_YARROW \
+	-DLTC_DEVRANDOM \
+	-DLTC_TRY_URANDOM_FIRST \
+	-DLTC_RNG_GET_BYTES \
+	-DLTC_RNG_MAKE_PRNG \
+	-DLTC_DER \
+	-DLTC_MRSA \
+	-DLTC_MECC \
+	-DLTC_BASE64 
 
 tomclean:
 	rm -f $(addprefix libtomcrypt/src/, $(LTCOBJ))