X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=ba2c95f69fd42b913068a4766c0813c1d7b939ac;hb=094fa8c1bc2e27a560833c6a829b1d9b60de7034;hp=053ab9b53bd99e15c064013d57e4c77f1a56698e;hpb=e8a2e982bf9d10d3b4cc93d53e235274002fcf2e;p=zpackage

diff --git a/Makefile b/Makefile
index 053ab9b..ba2c95f 100644
--- a/Makefile
+++ b/Makefile
@@ -25,18 +25,20 @@ 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))
 
 curdir=$(shell pwd)
 
-ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
+COMPILED=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 	zpm-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse \
 	zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
 	zpm-elftype zpm-quote zpm-note zpm-search zpm-add zpm-fetchurl \
 	zpm-sign
 
+BINARIES=$(addprefix bin/, $(COMPILED))
+
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-test zpm-log \
 	zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
 	zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit \
@@ -44,11 +46,10 @@ SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-test zpm-log \
 
 MANPAGES=$(shell ls doc/*.8)
 #MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8 gc.8)
-COMPILED=$(ZPKGBIN)
-PROGRAMS=$(SCRIPTS) $(COMPILED)
+PROGRAMS=$(addprefix bin/, $(SCRIPTS)) $(BINARIES)
 
 def: programs
-	strip $(ZPKGBIN)
+	strip $(BINARIES)
 
 d:
 	printf '%s\n' $(LZMAOBJ)
@@ -102,87 +103,87 @@ lzma.o: lzma.c
 	gcc -std=c99 -Wall -c -o $@ $<
 
 stest: $(ZPKGBIN)
-	PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
+	PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/$(T).t
 
 t/ctap/prove: t/ctap/prove.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 test: $(ZPKGBIN) t/ctap/prove
-	@PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
+	@PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/ctap/prove t/*.t
 
-programs: $(ZPKGBIN)
+programs: $(PROGRAMS)
 
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
 
-zpm-elftype: elf/elftype.o
+bin/zpm-elftype: elf/elftype.o
 	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-soname: elf/soname.o
+bin/zpm-soname: elf/soname.o
 	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-soneed: elf/needed.o
+bin/zpm-soneed: elf/needed.o
 	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-addfile: src/addfile.o libzpm.a libelf.a
+bin/zpm-addfile: src/addfile.o libzpm.a libelf.a
 	$(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 lib/sha256.o: CFLAGS+=-O3
 lib/blake2/ref/blake2b-ref.o: CFLAGS+=-O3
 
 zpm-hash: libzpm.a
-zpm-hash: src/hash.o lib/sha256.o
+bin/zpm-hash: src/hash.o lib/sha256.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
-zpm-blake2: src/blake2.o lib/sha256.o lib/blake2/ref/blake2b-ref.o
+bin/zpm-blake2: src/blake2.o lib/sha256.o lib/blake2/ref/blake2b-ref.o
 	$(CC) -O3 $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a
+bin/zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
 
-zpm-init: src/init.o libzpm.a
+bin/zpm-init: src/init.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-stat: src/stat.o
+bin/zpm-stat: src/stat.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
-zpm-extract: src/extract.o libzpm.a
+bin/zpm-extract: src/extract.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-script: src/script.o libzpm.a
+bin/zpm-script: src/script.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 	
-zpm-packagehash: src/packagehash.o libzpm.a
+bin/zpm-packagehash: src/packagehash.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 src/foreach-path.o: CFLAGS+=-Wno-unused-parameter
 src/script.o: CFLAGS+=-Wno-unused-parameter
 
-zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h
+bin/zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-findpkg: src/findpkg.o libzpm.a
+bin/zpm-findpkg: src/findpkg.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-search: src/search.o libzpm.a
+bin/zpm-search: src/search.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-note: src/note.o libzpm.a
+bin/zpm-note: src/note.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-syncfs: src/syncfs.o libzpm.a libelf.a
+bin/zpm-syncfs: src/syncfs.o libzpm.a libelf.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
 
-zpm-parse: src/parse.o lib/parse.o
+bin/zpm-parse: src/parse.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-zpm-add: src/add.o libzpm.a libelf.a
+bin/zpm-add: src/add.o libzpm.a libelf.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-quote: src/quote.o
+bin/zpm-quote: src/quote.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
-db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql
+db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql schema/sign.sql
 	echo 'begin;' > $@
 	cat $+ >> $@
 	echo 'commit;' >> $@
@@ -206,10 +207,10 @@ sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile
 
 lib/zpm.o: newdb.c
 
-zpm-vercmp: src/vercmp.o lib/vercmp.o lib/parse.o
+bin/zpm-vercmp: src/vercmp.o lib/vercmp.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 	
-zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o lib/parse.o
+bin/zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 libelf.a: elf/libelf.o
@@ -260,7 +261,7 @@ crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM \
 
 #/usr/musl/bin/musl-clang -Wall -Wextra -Wno-missing-braces -Werror -Wno-pointer-sign -I. -DTFM_DESC -DTFM_NO_ASM -I ../libtomcrypt/src/headers -I ../tomsfastmath/src/headers -DSTRICT_TLS -DIGNORE_SESSION_ID --rtlib=compiler-rt   -c -o tlse.o tlse.c
 
-tls.o: $(addprefix crypto/, $(TLSOBJ))
+crypto/tls.o: $(addprefix crypto/, $(TLSOBJ))
 	ld -o $@ -r $+
 
 TFMOBJ= \
@@ -355,6 +356,7 @@ TFMOBJ= \
    sqr/fp_sqrmod.o
 
 tomsfastmath/src/addsub/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4
+
 tomsfastmath/src/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4
 
 tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ))
@@ -362,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 \
@@ -450,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 \
@@ -466,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 \
@@ -478,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 \
@@ -719,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 \
@@ -754,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 \
@@ -765,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 $+
@@ -782,7 +761,7 @@ rfc3986: rfc3986.c
 
 src/fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign
 
-zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o
+bin/zpm-fetchurl: ltc.o crypto/tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o
 	$(CC) $(CFLAGS) -static -o $@ $+
 
 testddg: zpm-fetchurl
@@ -802,12 +781,15 @@ crypto/libeddsa/lib/sc.c \
 crypto/libeddsa/lib/sha512.c \
 crypto/libeddsa/lib/x25519.c
 
-SIGNOBJ=$(SIGNSRC:.c=.o)
+SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2b.o \
+	crypto/chacha.o
 
 $(SIGNOBJ): CFLAGS=-Wall -Wextra -W -Werror -Wno-pointer-sign \
-	-Icrypto/libeddsa/lib -Wno-unused-command-line-argument
+	-Wno-missing-braces \
+	-Icrypto/libeddsa/lib -Wno-unused-command-line-argument \
+	-I.
 
-zpm-sign: $(SIGNOBJ)
+bin/zpm-sign: $(SIGNOBJ)
 	$(CC) -Wall -Wextra -W -Werror -Wno-unused-command-line-argument -static -o $@ $+
 
 clean: