package signature work

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index dabebe853f4664a69878df27189b8bbeb5750793..cd2ce62859dcd8c7ee9d71a0f8011c99fd66305f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ lib/jsw/jsw_rbtree.c
 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
+         parse.c integ.c seterror.c notes.c createpkg.c buffer.c \
+         blake2/ref/blake2b-ref.o
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -126,9 +127,16 @@ zpm-soneed: elf/needed.o
 zpm-addfile: src/addfile.o libzpm.a libelf.a
        $(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-hash: src/hash.o libzpm.a
+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
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
+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
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
 
@@ -174,7 +182,7 @@ zpm-add: src/add.o libzpm.a libelf.a
 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;' >> $@
@@ -794,10 +802,13 @@ 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/blake2/ref/blake2b-ref.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)
        $(CC) -Wall -Wextra -W -Werror -Wno-unused-command-line-argument -static -o $@ $+