X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=8452ed85d61f35c6e9a5dfe693ca070571af9bdf;hb=2cd74312335854621dc11ddfe55181292eb89c38;hp=fc12c2c6144c462ef52966d56914208f4455fe53;hpb=7955b22e032857bed284c22c5303c0a289b4bd71;p=zpackage diff --git a/Makefile b/Makefile index fc12c2c..8452ed8 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ stest: $(ZPKGBIN) t/ctap/prove: t/ctap/prove.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -test: $(ZPKGBIN) t/ctap/prove +test: $(ZPKGBIN) t/ctap/prove db.sql @PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/ctap/prove t/*.t programs: $(PROGRAMS) @@ -364,17 +364,6 @@ 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 +394,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 \ @@ -437,16 +403,10 @@ LTCOBJ= \ hashes/helper/hash_filehandle.o \ hashes/helper/hash_memory.o \ hashes/helper/hash_memory_multi.o \ - hashes/rmd128.o \ - hashes/rmd160.o \ - 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 \ @@ -468,40 +428,13 @@ LTCOBJ= \ mac/hmac/hmac_memory_multi.o \ mac/hmac/hmac_process.o \ mac/hmac/hmac_test.o \ - mac/omac/omac_done.o \ - mac/omac/omac_file.o \ - mac/omac/omac_init.o \ - mac/omac/omac_memory.o \ - mac/omac/omac_memory_multi.o \ - mac/omac/omac_process.o \ misc/crypt/crypt_find_prng.o \ - mac/omac/omac_test.o \ - mac/pelican/pelican.o \ - mac/pelican/pelican_memory.o \ - mac/pelican/pelican_test.o \ - mac/pmac/pmac_done.o \ - mac/pmac/pmac_file.o \ - mac/pmac/pmac_init.o \ - mac/pmac/pmac_memory.o \ - mac/pmac/pmac_memory_multi.o \ - mac/pmac/pmac_ntz.o \ - mac/pmac/pmac_process.o \ - mac/pmac/pmac_shift_xor.o \ - mac/pmac/pmac_test.o \ mac/poly1305/poly1305.o \ mac/poly1305/poly1305_file.o \ mac/poly1305/poly1305_memory.o \ mac/poly1305/poly1305_memory_multi.o \ mac/poly1305/poly1305_test.o \ - mac/xcbc/xcbc_done.o \ - mac/xcbc/xcbc_file.o \ - mac/xcbc/xcbc_init.o \ - mac/xcbc/xcbc_memory.o \ - mac/xcbc/xcbc_memory_multi.o \ - mac/xcbc/xcbc_process.o \ - mac/xcbc/xcbc_test.o \ math/fp/ltc_ecc_fp_mulmod.o \ - math/gmp_desc.o \ math/ltm_desc.o \ math/multi.o \ math/radix_to_bin.o \ @@ -571,33 +504,12 @@ LTCOBJ= \ modes/ecb/ecb_done.o \ modes/ecb/ecb_encrypt.o \ modes/ecb/ecb_start.o \ - modes/f8/f8_decrypt.o \ - modes/f8/f8_done.o \ - modes/f8/f8_encrypt.o \ - modes/f8/f8_getiv.o \ - modes/f8/f8_setiv.o \ - modes/f8/f8_start.o \ - modes/f8/f8_test_mode.o \ - modes/lrw/lrw_decrypt.o \ - modes/lrw/lrw_done.o \ - modes/lrw/lrw_encrypt.o \ - modes/lrw/lrw_getiv.o \ - modes/lrw/lrw_process.o \ - modes/lrw/lrw_start.o \ - modes/lrw/lrw_setiv.o \ - modes/lrw/lrw_test.o \ modes/ofb/ofb_decrypt.o \ modes/ofb/ofb_done.o \ modes/ofb/ofb_encrypt.o \ modes/ofb/ofb_getiv.o \ modes/ofb/ofb_setiv.o \ modes/ofb/ofb_start.o \ - modes/xts/xts_decrypt.o \ - modes/xts/xts_done.o \ - modes/xts/xts_encrypt.o \ - modes/xts/xts_init.o \ - modes/xts/xts_mult_x.o \ - modes/xts/xts_test.o \ pk/asn1/der/bit/der_decode_bit_string.o \ pk/asn1/der/bit/der_decode_raw_bit_string.o \ pk/asn1/der/bit/der_encode_bit_string.o \ @@ -720,23 +632,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))