git.samba.org / gd / nettle / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Implemented eddsa signature internals.
[gd/nettle] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 5888b0048dc883fd88f1f3caec2d18785ab95a08..666155149f7d1095f3a90afa9361546c4544e403 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,7 @@ include config.make
 
 # $(srcdir) is needed for includes in bignum.h.
 PRE_CPPFLAGS = -I. -I$(srcdir)
+EXTRA_CFLAGS = $(CCPIC)
 
 # FIXME: Add configuration of LIBEXT?
 LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
@@ -159,25 +160,31 @@ hogweed_SOURCES = sexp.c sexp-format.c \
                  dsa2sexp.c sexp2dsa.c \
                  pgp-encode.c rsa2openpgp.c \
                  der-iterator.c der2rsa.c der2dsa.c \
-                 sec-add-1.c sec-sub-1.c sec-modinv.c sec-tabselect.c \
+                 sec-add-1.c sec-sub-1.c sec-tabselect.c \
                  gmp-glue.c cnd-copy.c \
-                 ecc-mod.c ecc-generic-modp.c ecc-generic-modq.c \
-                 ecc-modp.c ecc-modq.c ecc-generic-redc.c \
+                 ecc-mod.c ecc-mod-inv.c \
+                 ecc-mod-arith.c ecc-pp1-redc.c ecc-pm1-redc.c \
                  ecc-192.c ecc-224.c ecc-256.c ecc-384.c ecc-521.c \
                  ecc-25519.c \
                  ecc-size.c ecc-j-to-a.c ecc-a-to-j.c \
                  ecc-dup-jj.c ecc-add-jja.c ecc-add-jjj.c \
+                 ecc-eh-to-a.c \
+                 ecc-dup-eh.c ecc-add-eh.c ecc-add-ehh.c \
+                 ecc-mul-g-eh.c ecc-mul-a-eh.c \
                  ecc-mul-g.c ecc-mul-a.c ecc-hash.c ecc-random.c \
                  ecc-point.c ecc-scalar.c ecc-point-mul.c ecc-point-mul-g.c \
                  ecc-ecdsa-sign.c ecdsa-sign.c \
                  ecc-ecdsa-verify.c ecdsa-verify.c ecdsa-keygen.c \
+                 curve25519-mul-g.c curve25519-mul.c curve25519-eh-to-x.c \
+                 eddsa-compress.c eddsa-decompress.c eddsa-hash.c \
+                 eddsa-sign.c \
                  $(OPT_HOGWEED_SOURCES)
 
 HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h \
          base16.h base64.h buffer.h camellia.h cast128.h \
          cbc.h ccm.h chacha.h chacha-poly1305.h ctr.h \
-         des.h des-compat.h dsa.h dsa-compat.h eax.h \
-         ecc-curve.h ecc.h ecdsa.h \
+         curve25519.h des.h des-compat.h dsa.h dsa-compat.h eax.h \
+         ecc-curve.h ecc.h ecdsa.h eddsa.h \
          gcm.h gosthash94.h hmac.h \
          knuth-lfib.h \
          macros.h \
@@ -216,10 +223,8 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h getopt_int.h \
 
 # Rules building static libraries
 nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_NETTLE_SOURCES:.asm=.$(OBJEXT))
-nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJEXT)=.p$(OBJEXT))
 
 hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_HOGWEED_SOURCES:.asm=.$(OBJEXT))
-hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT))
 
 libnettle.a: $(nettle_OBJS)
        -rm -f $@
@@ -234,12 +239,12 @@ libhogweed.a: $(hogweed_OBJS)
        echo hogweed > libhogweed.stamp
 
 .c.$(OBJEXT):
-       $(COMPILE) $(CCPIC_MAYBE) -c $< \
+       $(COMPILE) -c $< \
        && $(DEP_PROCESS)
 
 # Rules building shared libraries.
-$(LIBNETTLE_FORLINK): $(nettle_PURE_OBJS)
-       $(LIBNETTLE_LINK) $(nettle_PURE_OBJS) -o $@ $(LIBNETTLE_LIBS)
+$(LIBNETTLE_FORLINK): $(nettle_OBJS)
+       $(LIBNETTLE_LINK) $(nettle_OBJS) -o $@ $(LIBNETTLE_LIBS)
        -mkdir .lib 2>/dev/null
        (cd .lib \
           && rm -f $(LIBNETTLE_FORLINK) \
@@ -249,8 +254,8 @@ $(LIBNETTLE_FORLINK): $(nettle_PURE_OBJS)
               && $(LN_S) $(LIBNETTLE_FORLINK) $(LIBNETTLE_SONAME) ; } )
        echo nettle > libnettle.stamp
 
-$(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
-       $(LIBHOGWEED_LINK) $(hogweed_PURE_OBJS) -o $@ $(LIBHOGWEED_LIBS)
+$(LIBHOGWEED_FORLINK): $(hogweed_OBJS) $(LIBNETTLE_FORLINK)
+       $(LIBHOGWEED_LINK) $(hogweed_OBJS) -o $@ $(LIBHOGWEED_LIBS)
        -mkdir .lib 2>/dev/null
        (cd .lib \
           && rm -f $(LIBHOGWEED_FORLINK) \
@@ -260,10 +265,6 @@ $(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
               && $(LN_S) $(LIBHOGWEED_FORLINK) $(LIBHOGWEED_SONAME) ; } )
        echo hogweed > libhogweed.stamp
 
-.c.p$(OBJEXT):
-       $(COMPILE) $(SHLIBCFLAGS) -c $< -o $@ \
-       && $(DEP_PROCESS)
-
 # For Solaris and BSD make, we have to use an explicit rule for each
 # executable. Avoid object file targets to make it easy to run the
 # right compiler.
@@ -304,7 +305,6 @@ $(des_headers): desdata.c
          test -s $${f}T && mv -f $${f}T $$f
 
 des.$(OBJEXT): des.c des.h $(des_headers)
-des.p$(OBJEXT): des.c des.h $(des_headers)
 
 # Generate ECC files.
 # Some possible choices for 192:
@@ -362,24 +362,10 @@ ecc-384.$(OBJEXT): ecc-384.h
 ecc-521.$(OBJEXT): ecc-521.h
 ecc-25519.$(OBJEXT): ecc-25519.h
 
-ecc-192.p$(OBJEXT): ecc-192.h
-ecc-224.p$(OBJEXT): ecc-224.h
-ecc-256.p$(OBJEXT): ecc-256.h
-ecc-384.p$(OBJEXT): ecc-384.h
-ecc-521.p$(OBJEXT): ecc-521.h
-ecc-25519.p$(OBJEXT): ecc-25519.h
-
-.asm.s: $(srcdir)/asm.m4 machine.m4 config.m4
-       $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$@T \
-       && test -s $@T && mv -f $@T $@
-
-.s.$(OBJEXT):
-       $(COMPILE) $(CCPIC_MAYBE) -c $<
-       @echo > $@.d
-
-.s.p$(OBJEXT):
-       $(COMPILE) $(SHLIBCFLAGS) -c $< -o $@
-       @echo > $@.d
+.asm.$(OBJEXT): $(srcdir)/asm.m4 machine.m4 config.m4
+       $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$*.s
+       $(COMPILE) -c $*.s
+       @echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
 
 # Texinfo rules
 .texinfo.info:
@@ -624,8 +610,8 @@ distcheck: dist
        $(rm_distcheck)
 
 clean-here:
-       -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s \
-               ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h \
+       -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.s \
+               ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h ecc-25519.h \
                eccdata$(EXEEXT_FOR_BUILD) eccdata.stamp
        -rm -rf .lib libnettle.stamp libhogweed.stamp
 
@@ -641,5 +627,5 @@ maintainer-clean-here:
 tags-here:     
        etags -o $(srcdir)/TAGS $(srcdir)/*.c $(srcdir)/*.h
 
-DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) $(SOURCES:.c=.p$(OBJEXT).d) asm.d
+DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d)
 @DEP_INCLUDE@ $(DEP_FILES)
Unnamed repository; edit this file 'description' to name the repository.