remove yarrow

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index fc12c2c6144c462ef52966d56914208f4455fe53..f97aac2f5a81403eae0b8332cbf87a06a0d2a5c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -364,17 +364,9 @@ tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ))
 
 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 \
@@ -405,31 +397,8 @@ LTCOBJ= \
    misc/crypt/crypt_find_cipher_id.o \
    misc/crypt/crypt_find_hash_any.o \
    misc/crypt/crypt_find_hash.o \
-   encauth/ocb/ocb_decrypt.o \
-   encauth/ocb/ocb_decrypt_verify_memory.o \
-   encauth/ocb/ocb_done_decrypt.o \
-   encauth/ocb/ocb_done_encrypt.o \
    misc/crypt/crypt_find_hash_id.o \
    misc/crypt/crypt_find_hash_oid.o \
-   encauth/ocb/ocb_encrypt.o \
-   encauth/ocb/ocb_encrypt_authenticate_memory.o \
-   encauth/ocb/ocb_init.o \
-   encauth/ocb/ocb_ntz.o \
-   encauth/ocb/ocb_shift_xor.o \
-   encauth/ocb/ocb_test.o \
-   encauth/ocb/s_ocb_done.o \
-   encauth/ocb3/ocb3_add_aad.o \
-   encauth/ocb3/ocb3_decrypt.o \
-   encauth/ocb3/ocb3_decrypt_last.o \
-   encauth/ocb3/ocb3_decrypt_verify_memory.o \
-   encauth/ocb3/ocb3_done.o \
-   encauth/ocb3/ocb3_encrypt.o \
-   encauth/ocb3/ocb3_encrypt_authenticate_memory.o \
-   encauth/ocb3/ocb3_encrypt_last.o \
-   encauth/ocb3/ocb3_init.o \
-   encauth/ocb3/ocb3_int_ntz.o \
-   encauth/ocb3/ocb3_int_xor_blocks.o \
-   encauth/ocb3/ocb3_test.o \
    hashes/blake2b.o \
    hashes/blake2s.o \
    hashes/chc/chc.o \
@@ -442,11 +411,9 @@ LTCOBJ= \
    hashes/rmd256.o \
    hashes/rmd320.o \
    hashes/sha1.o \
-   hashes/sha2/sha224.o \
    hashes/sha2/sha256.o \
    hashes/sha2/sha384.o \
    hashes/sha2/sha512.o \
-   hashes/sha2/sha512_224.o \
    hashes/sha2/sha512_256.o \
    hashes/sha3.o \
    hashes/sha3_test.o \
@@ -720,23 +687,50 @@ 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 \
-   prngs/yarrow.o \
    stream/chacha/chacha_crypt.o \
    stream/chacha/chacha_done.o \
    stream/chacha/chacha_ivctr32.o \
    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_CHACHA \
+       -DLTC_ECB_MODE \
+       -DLTC_CBC_MODE \
+       -DLTC_CTR_MODE \
+       -DLTC_GCM_MODE \
+       -DLTC_SHA1 \
+       -DLTC_SHA3 \
+       -DLTC_SHA512 \
+       -DLTC_SHA384 \
+       -DLTC_SHA256 \
+       -DLTC_HASH_HELPERS \
+       -DLTC_HMAC \
+       -DLTC_OMAC \
+       -DLTC_CCM_MODE \
+       -DLTC_SPRNG \
+       -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))