X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=9800cfe83fd13178e1f7058a5db4aa01e2bd150c;hp=aad20b6ec1209d91ee6e49478b320ceb77244047;hb=72b60d5f77676b6b500d58bae81a27923fa1bee7;hpb=841985fecd64252b395558f0cc5b5a44065e3808

diff --git a/Makefile b/Makefile
index aad20b6..9800cfe 100644
--- 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,24 +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 \
-   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 \
@@ -399,14 +384,6 @@ LTCOBJ= \
    encauth/chachapoly/chacha20poly1305_setiv.o \
    encauth/chachapoly/chacha20poly1305_setiv_rfc7905.o \
    encauth/chachapoly/chacha20poly1305_test.o \
-   encauth/eax/eax_addheader.o \
-   encauth/eax/eax_decrypt.o \
-   encauth/eax/eax_decrypt_verify_memory.o \
-   encauth/eax/eax_done.o \
-   encauth/eax/eax_encrypt.o \
-   encauth/eax/eax_encrypt_authenticate_memory.o \
-   encauth/eax/eax_init.o \
-   encauth/eax/eax_test.o \
    encauth/gcm/gcm_add_aad.o \
    encauth/gcm/gcm_add_iv.o \
    encauth/gcm/gcm_done.o \
@@ -452,9 +429,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 +442,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 +453,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 +687,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 \
@@ -753,10 +712,8 @@ 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/sober128.o \
    prngs/sprng.o \
    prngs/yarrow.o \
    stream/chacha/chacha_crypt.o \
@@ -765,13 +722,47 @@ 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 \
-   stream/sober128/sober128_stream.o \
-   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
+   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_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))
+	rm -f ltc.o
 
 ltc.o: $(addprefix libtomcrypt/src/, $(LTCOBJ))
 	ld -o $@ -r $+
@@ -804,7 +795,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 \