Implemented eddsa signature internals.
[gd/nettle] / Makefile.in
index c24ce352c1bcd9e27b1c6bbd255bcbafbffa5360..666155149f7d1095f3a90afa9361546c4544e403 100644 (file)
@@ -5,8 +5,6 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-LIBOBJS = @LIBOBJS@
-
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -14,11 +12,19 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
 MKDIR_P = @MKDIR_P@
 
+OPT_ASM_NETTLE_SOURCES = @OPT_ASM_NETTLE_SOURCES@
+OPT_ASM_HOGWEED_SOURCES = @OPT_ASM_HOGWEED_SOURCES@
+
+OPT_HOGWEED_SOURCES = @IF_MINI_GMP@ mini-gmp.c
+
 SUBDIRS = tools testsuite examples
 
 include config.make
 
-PRE_CPPFLAGS = -I.
+# $(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
 SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
@@ -29,8 +35,9 @@ getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT))
 internal_SOURCES = nettle-internal.c
 internal_TARGETS = $(internal_SOURCES:.c=.$(OBJEXT))
 
-TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) twofishdata$(EXEEXT) \
-         shadata$(EXEEXT) gcmdata$(EXEEXT) \
+TARGETS = aesdata$(EXEEXT_FOR_BUILD) desdata$(EXEEXT_FOR_BUILD) \
+          twofishdata$(EXEEXT_FOR_BUILD) shadata$(EXEEXT_FOR_BUILD) \
+          gcmdata$(EXEEXT_FOR_BUILD) \
          $(getopt_TARGETS) $(internal_TARGETS) \
          $(LIBTARGETS) $(SHLIBTARGETS)
 IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
@@ -62,48 +69,77 @@ all-here: $(TARGETS) $(DOCTARGETS)
 
 nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
                 aes-encrypt-internal.c aes-encrypt.c aes-encrypt-table.c \
-                aes-set-encrypt-key.c aes-set-decrypt-key.c aes-meta.c \
-                arcfour.c arcfour-crypt.c arcfour-meta.c \
-                arctwo.c arctwo-meta.c gosthash94-meta.c \
+                aes-invert-internal.c aes-set-key-internal.c \
+                aes-set-encrypt-key.c aes-set-decrypt-key.c \
+                aes128-set-encrypt-key.c aes128-set-decrypt-key.c \
+                aes128-meta.c \
+                aes192-set-encrypt-key.c aes192-set-decrypt-key.c \
+                aes192-meta.c \
+                aes256-set-encrypt-key.c aes256-set-decrypt-key.c \
+                aes256-meta.c \
+                arcfour.c arcfour-crypt.c \
+                arctwo.c arctwo-meta.c blowfish.c \
                 base16-encode.c base16-decode.c base16-meta.c \
-                 base64-encode.c base64-decode.c base64-meta.c \
-                camellia-crypt.c camellia-crypt-internal.c \
-                camellia-set-encrypt-key.c camellia-set-decrypt-key.c \
-                camellia-table.c camellia-meta.c \
-                cast128.c cast128-meta.c \
-                blowfish.c \
-                cbc.c ctr.c gcm.c gcm-aes.c \
-                des.c \
-                des3.c des-compat.c \
+                base64-encode.c base64-decode.c base64-meta.c \
+                buffer.c buffer-init.c \
+                camellia-crypt-internal.c camellia-table.c \
+                camellia-absorb.c camellia-invert-key.c \
+                camellia128-set-encrypt-key.c camellia128-crypt.c \
+                camellia128-set-decrypt-key.c \
+                camellia128-meta.c \
+                camellia192-meta.c \
+                camellia256-set-encrypt-key.c camellia256-crypt.c \
+                camellia256-set-decrypt-key.c \
+                camellia256-meta.c \
+                cast128.c cast128-meta.c cbc.c \
+                ccm.c ccm-aes128.c ccm-aes192.c ccm-aes256.c \
+                chacha-crypt.c chacha-core-internal.c \
+                chacha-poly1305.c chacha-poly1305-meta.c \
+                chacha-set-key.c chacha-set-nonce.c \
+                ctr.c des.c des3.c des-compat.c \
+                eax.c eax-aes128.c eax-aes128-meta.c \
+                gcm.c gcm-aes.c \
+                gcm-aes128.c gcm-aes128-meta.c \
+                gcm-aes192.c gcm-aes192-meta.c \
+                gcm-aes256.c gcm-aes256-meta.c \
+                gcm-camellia128.c gcm-camellia128-meta.c \
+                gcm-camellia256.c gcm-camellia256-meta.c \
+                gosthash94.c gosthash94-meta.c \
                 hmac.c hmac-md5.c hmac-ripemd160.c hmac-sha1.c \
                 hmac-sha224.c hmac-sha256.c hmac-sha384.c hmac-sha512.c \
-                pbkdf2.c pbkdf2-hmac-sha1.c pbkdf2-hmac-sha256.c \
                 knuth-lfib.c \
                 md2.c md2-meta.c md4.c md4-meta.c \
                 md5.c md5-compress.c md5-compat.c md5-meta.c \
-                gosthash94.c \
+                memxor.c \
+                nettle-meta-aeads.c nettle-meta-armors.c \
+                nettle-meta-ciphers.c nettle-meta-hashes.c \
+                pbkdf2.c pbkdf2-hmac-sha1.c pbkdf2-hmac-sha256.c \
+                poly1305-aes.c poly1305-internal.c \
+                realloc.c \
                 ripemd160.c ripemd160-compress.c ripemd160-meta.c \
                 salsa20-core-internal.c \
-                salsa20-crypt.c salsa20-set-key.c \
+                salsa20-crypt.c salsa20r12-crypt.c salsa20-set-key.c \
+                salsa20-set-nonce.c \
+                salsa20-128-set-key.c salsa20-256-set-key.c \
                 sha1.c sha1-compress.c sha1-meta.c \
                 sha256.c sha256-compress.c sha224-meta.c sha256-meta.c \
                 sha512.c sha512-compress.c sha384-meta.c sha512-meta.c \
+                sha512-224-meta.c sha512-256-meta.c \
                 sha3.c sha3-permute.c \
                 sha3-224.c sha3-224-meta.c sha3-256.c sha3-256-meta.c \
                 sha3-384.c sha3-384-meta.c sha3-512.c sha3-512-meta.c\
                 serpent-set-key.c serpent-encrypt.c serpent-decrypt.c \
                 serpent-meta.c \
                 twofish.c twofish-meta.c \
-                yarrow256.c yarrow_key_event.c \
-                buffer.c buffer-init.c realloc.c \
-                nettle-meta-hashes.c nettle-meta-ciphers.c \
-                nettle-meta-armors.c \
-                write-be32.c write-le32.c write-le64.c
+                umac-nh.c umac-nh-n.c umac-l2.c umac-l3.c \
+                umac-poly64.c umac-poly128.c umac-set-key.c \
+                umac32.c umac64.c umac96.c umac128.c \
+                write-be32.c write-le32.c write-le64.c \
+                yarrow256.c yarrow_key_event.c
 
 hogweed_SOURCES = sexp.c sexp-format.c \
                  sexp-transport.c sexp-transport-format.c \
-                 bignum.c bignum-next-prime.c \
-                 bignum-random.c bignum-random-prime.c \
+                 bignum.c bignum-random.c bignum-random-prime.c \
                  sexp2bignum.c \
                  pkcs1.c pkcs1-encrypt.c pkcs1-decrypt.c \
                  pkcs1-rsa-digest.c pkcs1-rsa-md5.c pkcs1-rsa-sha1.c \
@@ -115,77 +151,100 @@ hogweed_SOURCES = sexp.c sexp-format.c \
                  rsa-sha256-sign.c rsa-sha256-verify.c \
                  rsa-sha512-sign.c rsa-sha512-verify.c \
                  rsa-encrypt.c rsa-decrypt.c rsa-decrypt-tr.c \
-                 rsa-keygen.c rsa-compat.c rsa-blind.c \
+                 rsa-keygen.c rsa-blind.c \
                  rsa2sexp.c sexp2rsa.c \
-                 dsa.c dsa-sign.c dsa-verify.c dsa-keygen.c \
+                 dsa.c dsa-compat.c dsa-compat-keygen.c dsa-gen-params.c \
+                 dsa-sign.c dsa-verify.c dsa-keygen.c dsa-hash.c \
                  dsa-sha1-sign.c dsa-sha1-verify.c \
                  dsa-sha256-sign.c dsa-sha256-verify.c  \
                  dsa2sexp.c sexp2dsa.c \
                  pgp-encode.c rsa2openpgp.c \
-                 der-iterator.c der2rsa.c der2dsa.c
-
-HEADERS = aes.h arcfour.h arctwo.h asn1.h bignum.h blowfish.h \
+                 der-iterator.c der2rsa.c der2dsa.c \
+                 sec-add-1.c sec-sub-1.c sec-tabselect.c \
+                 gmp-glue.c cnd-copy.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 ctr.h gcm.h \
-         des.h des-compat.h dsa.h \
-         hmac.h \
-         pbkdf2.h \
+         cbc.h ccm.h chacha.h chacha-poly1305.h ctr.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 \
          md2.h md4.h \
-         gosthash94.h \
          md5.h md5-compat.h \
          memxor.h \
          nettle-meta.h nettle-types.h \
-         pgp.h pkcs1.h realloc.h ripemd160.h rsa.h rsa-compat.h \
+         pbkdf2.h \
+         pgp.h pkcs1.h realloc.h ripemd160.h rsa.h \
          salsa20.h sexp.h \
          serpent.h sha.h sha1.h sha2.h sha3.h twofish.h \
-         yarrow.h
+         umac.h yarrow.h poly1305.h
 
-INSTALL_HEADERS = $(HEADERS) nettle-stdint.h
+INSTALL_HEADERS = $(HEADERS) nettle-stdint.h bignum.h @IF_MINI_GMP@ mini-gmp.h
 
 SOURCES = $(nettle_SOURCES) $(hogweed_SOURCES) \
          $(getopt_SOURCES) $(internal_SOURCES) \
-         aesdata.c desdata.c twofishdata.c shadata.c gcmdata.c
+         aesdata.c desdata.c twofishdata.c shadata.c gcmdata.c eccdata.c
 
-DISTFILES = $(SOURCES) $(HEADERS) getopt.h .bootstrap run-tests \
+DISTFILES = $(SOURCES) $(HEADERS) getopt.h getopt_int.h \
+       .bootstrap run-tests \
        aclocal.m4 configure.ac \
-       configure stamp-h.in \
+       configure stamp-h.in bignum.h.in \
        config.guess config.sub install-sh texinfo.tex \
        config.h.in config.m4.in config.make.in Makefile.in \
-       README AUTHORS COPYING.LIB INSTALL NEWS TODO ChangeLog \
+       README AUTHORS COPYING.LESSERv3 COPYINGv2 COPYINGv3 \
+       INSTALL NEWS TODO ChangeLog \
        nettle.pc.in hogweed.pc.in \
-       memxor.c $(des_headers) descore.README \
+       $(des_headers) descore.README \
        aes-internal.h camellia-internal.h serpent-internal.h \
        cast128_sboxes.h desinfo.h desCode.h \
-       nettle-internal.h nettle-write.h prime-list.h \
-       asm.m4 \
+       nettle-internal.h nettle-write.h \
+       gmp-glue.h ecc-internal.h \
+       mini-gmp.h mini-gmp.c asm.m4 \
        nettle.texinfo nettle.info nettle.html nettle.pdf sha-example.c
 
 # Rules building static libraries
-nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(LIBOBJS)
-nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJEXT)=.p$(OBJEXT))
+nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_NETTLE_SOURCES:.asm=.$(OBJEXT))
 
-hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT))
-hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT))
+hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_HOGWEED_SOURCES:.asm=.$(OBJEXT))
 
 libnettle.a: $(nettle_OBJS)
        -rm -f $@
        $(AR) $(ARFLAGS) $@ $(nettle_OBJS)
        $(RANLIB) $@
+       echo nettle > libnettle.stamp
 
 libhogweed.a: $(hogweed_OBJS)
        -rm -f $@
        $(AR) $(ARFLAGS) $@ $(hogweed_OBJS)
        $(RANLIB) $@
+       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) \
@@ -193,9 +252,10 @@ $(LIBNETTLE_FORLINK): $(nettle_PURE_OBJS)
          && [ -z "$(LIBNETTLE_SONAME)" ] \
          || { rm -f $(LIBNETTLE_SONAME) \
               && $(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) \
@@ -203,29 +263,34 @@ $(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
          && [ -z "$(LIBHOGWEED_SONAME)" ] \
          || { rm -f $(LIBHOGWEED_SONAME) \
               && $(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
-aesdata$(EXEEXT): aesdata.$(OBJEXT)
-       $(LINK) aesdata.$(OBJEXT) $(LIBS) -o aesdata$(EXEEXT)
+# 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.
+aesdata$(EXEEXT_FOR_BUILD): aesdata.c
+       $(CC_FOR_BUILD) `test -f aesdata.c || echo '$(srcdir)/'`aesdata.c \
+       -o aesdata$(EXEEXT_FOR_BUILD)
 
-desdata$(EXEEXT): desdata.$(OBJEXT)
-       $(LINK) desdata.$(OBJEXT) $(LIBS) -o desdata$(EXEEXT)
+desdata$(EXEEXT_FOR_BUILD): desdata.c
+       $(CC_FOR_BUILD) `test -f desdata.c || echo '$(srcdir)/'`desdata.c \
+       -o desdata$(EXEEXT_FOR_BUILD)
 
-twofishdata$(EXEEXT): twofishdata.$(OBJEXT)
-       $(LINK) twofishdata.$(OBJEXT) $(LIBS) -o twofishdata$(EXEEXT)
+twofishdata$(EXEEXT_FOR_BUILD): twofishdata.c
+       $(CC_FOR_BUILD) `test -f twofishdata.c || echo '$(srcdir)/'`twofishdata.c \
+       -o twofishdata$(EXEEXT_FOR_BUILD)
 
-shadata$(EXEEXT): shadata.$(OBJEXT)
-       $(LINK) shadata.$(OBJEXT) $(LIBS) -lm -o shadata$(EXEEXT)
+shadata$(EXEEXT_FOR_BUILD): shadata.c
+       $(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \
+       -o shadata$(EXEEXT_FOR_BUILD)
 
-gcmdata$(EXEEXT): gcmdata.$(OBJEXT)
-       $(LINK) gcmdata.$(OBJEXT) $(LIBS) -o gcmdata$(EXEEXT)
+gcmdata$(EXEEXT_FOR_BUILD): gcmdata.c
+       $(CC_FOR_BUILD) `test -f gcmdata.c || echo '$(srcdir)/'`gcmdata.c \
+       -o gcmdata$(EXEEXT_FOR_BUILD)
 
-# .$(OBJEXT)$(EXEEXT):
-#      $(LINK) $< $(LIBS) -o $@
+eccdata$(EXEEXT_FOR_BUILD): eccdata.c mini-gmp.c mini-gmp.h
+       $(CC_FOR_BUILD) `test -f eccdata.c || echo '$(srcdir)/'`eccdata.c \
+       -o eccdata$(EXEEXT_FOR_BUILD)
 
 # desCore rules
 # It seems using $(srcdir)/ doesn't work with GNU make 3.79.1
@@ -234,24 +299,73 @@ des_headers = rotors.h keymap.h
 
 # Generate DES headers.
 $(des_headers): desdata.c
-       $(MAKE) desdata$(EXEEXT)
+       $(MAKE) desdata$(EXEEXT_FOR_BUILD)
        f="$(srcdir)/`basename $@`"; \
-         ./desdata$(EXEEXT) $(@F) > $${f}T; \
+         ./desdata$(EXEEXT_FOR_BUILD) $(@F) > $${f}T; \
          test -s $${f}T && mv -f $${f}T $$f
 
 des.$(OBJEXT): des.c des.h $(des_headers)
 
-.asm.$(OBJEXT):
-       $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
-               $< >$*.s
-       $(COMPILE) $(CCPIC_MAYBE) -c $*.s
-       echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
-
-.asm.p$(OBJEXT):
-       $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
-               $< >$*.s
-       $(COMPILE) $(SHLIBCFLAGS) -c $*.s -o $@
-       echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
+# Generate ECC files.
+# Some possible choices for 192:
+#      k = 15, c = 4,  64 entries,  ~3 KB
+#      k = 20, c = 6, 128 entries,  ~6 KB
+#      k = 10, c = 6, 256 entries, ~12 KB
+#      k =  7, c = 6, 320 entries, ~15 KB
+#      k =  9, c = 7, 512 entries, ~24 KB
+ecc-192.h: eccdata.stamp
+       ./eccdata$(EXEEXT_FOR_BUILD) 192 7 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+# Some possible choices for 224:
+#      k = 18, c = 4,  64 entries,  ~4 KB
+#      k = 24, c = 6, 128 entries,  ~8 KB
+#      k = 12, c = 6, 256 entries, ~16 KB
+#      k =  8, c = 6, 320 entries, ~20 KB
+#      k = 10, c = 7, 512 entries, ~32 KB
+ecc-224.h: eccdata.stamp
+       ./eccdata$(EXEEXT_FOR_BUILD) 224 12 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+# Some possible choices for 256:
+#      k = 20, c = 4,  64 entries,  ~4 KB
+#      k = 27, c = 6, 128 entries,  ~8 KB
+#      k = 14, c = 6, 256 entries, ~16 KB
+#      k =  9, c = 6, 320 entries, ~20 KB
+#      k = 12, c = 7, 512 entries, ~32 KB
+ecc-256.h: eccdata.stamp
+       ./eccdata$(EXEEXT_FOR_BUILD) 256 14 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+# Some possible choices for 384:
+#      k = 31, c = 4,  64 entries,  ~6 KB
+#      k = 41, c = 6, 128 entries, ~12 KB
+#      k = 20, c = 6, 256 entries, ~24 KB
+#      k = 14, c = 6, 320 entries, ~30 KB
+#      k = 18, c = 7, 512 entries, ~48 KB
+ecc-384.h: eccdata.stamp
+       ./eccdata$(EXEEXT_FOR_BUILD) 384 41 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+# Some possible choices for 521:
+#      k = 42, c = 4,  64 entries,  ~9 KB
+#      k = 56, c = 6, 128 entries, ~18 KB
+#      k = 28, c = 6, 256 entries, ~35 KB
+#      k = 19, c = 6, 320 entries, ~44 KB
+#      k = 24, c = 7, 512 entries, ~70 KB
+ecc-521.h: eccdata.stamp
+       ./eccdata$(EXEEXT_FOR_BUILD) 521 56 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+
+ecc-25519.h: eccdata.stamp
+       ./eccdata$(EXEEXT_FOR_BUILD) 255 14 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+
+eccdata.stamp: eccdata.c
+       $(MAKE) eccdata$(EXEEXT_FOR_BUILD)
+       echo stamp > eccdata.stamp
+
+ecc-192.$(OBJEXT): ecc-192.h
+ecc-224.$(OBJEXT): ecc-224.h
+ecc-256.$(OBJEXT): ecc-256.h
+ecc-384.$(OBJEXT): ecc-384.h
+ecc-521.$(OBJEXT): ecc-521.h
+ecc-25519.$(OBJEXT): ecc-25519.h
+
+.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:
@@ -294,6 +408,9 @@ stamp-h: config.h.in config.status
        ./config.status config.h
        echo timestamp > stamp-h
 
+bignum.h: bignum.h.in config.status
+       ./config.status $@
+
 Makefile: Makefile.in config.status
        ./config.status $@
 
@@ -436,9 +553,10 @@ distdir: $(DISTFILES)
          else cp "$(srcdir)/$$f" "$(distdir)" ; \
          fi ; \
        done
-       set -e; for d in sparc32 sparc64 x86 x86_64; do \
+       set -e; for d in sparc32 sparc64 x86 x86_64 arm arm/neon arm/v6 ; do \
          mkdir "$(distdir)/$$d" ; \
-         cp $(srcdir)/$$d/*.asm $(srcdir)/$$d/*.m4 "$(distdir)/$$d" ; \
+         find "$(srcdir)/$$d" -maxdepth 1 '(' -name '*.asm' -o -name '*.m4' ')' \
+           -exec cp '{}' "$(distdir)/$$d" ';' ; \
        done
        set -e; for d in $(SUBDIRS); do \
          sd="$(distdir)/$$d" ; \
@@ -492,12 +610,14 @@ distcheck: dist
        $(rm_distcheck)
 
 clean-here:
-       -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s
-       -rm -rf .lib
+       -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
 
 distclean-here: clean-here
        -rm -f config.h stamp-h config.log config.status machine.m4 \
-       config.make config.m4 Makefile nettle-stdint.h \
+       config.make config.m4 Makefile nettle-stdint.h bignum.h \
        nettle.pc hogweed.pc \
        *.asm *.d
 
@@ -507,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)
+DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d)
 @DEP_INCLUDE@ $(DEP_FILES)