genlimits: New program to generate useful limit MPs for C types.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index a1a6730..6f75ebc 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -89,7 +89,8 @@ _(square) _(rijndael) _(whirlpool) dnl
 _(safer) _(mars) _(tiger) dnl
 _(gfshare) _(gfx-sqr)')
 
 _(safer) _(mars) _(tiger) dnl
 _(gfshare) _(gfx-sqr)')
 

-autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
+autoheaders: \
+  addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h mplimits.h

 define(`emit', `
 _item`'-tab.h: _item`'-mktab$(EXEEXT)
        ./_item`'-mktab >_item`'-tab.h.new
 define(`emit', `
 _item`'-tab.h: _item`'-mktab$(EXEEXT)
        ./_item`'-mktab >_item`'-tab.h.new


@@ -101,11 +102,18 @@ primetab.c: genprimes$(EXEEXT)
        ./genprimes -h primetab.h -c primetab.c \
                -s CATACOMB_PRIMETAB_H -n 256 \
                -t "unsigned short" -i primetab
        ./genprimes -h primetab.h -c primetab.c \
                -s CATACOMB_PRIMETAB_H -n 256 \
                -t "unsigned short" -i primetab

-archinclude_HEADERS = mptypes.h
+archinclude_HEADERS = mptypes.h mplimits.h

 mptypes.h: mptypes$(EXEEXT)
        ./mptypes >mptypes.h.new
        mv mptypes.h.new mptypes.h
 
 mptypes.h: mptypes$(EXEEXT)
        ./mptypes >mptypes.h.new
        mv mptypes.h.new mptypes.h
 

+mplimits.h: genlimits$(EXEEXT)
+       ./genlimits h >mplimits.h.new
+       mv mplimits.h.new mplimits.h
+mplimits.c: genlimits$(EXEEXT)
+       ./genlimits c >mplimits.c.new
+       mv mplimits.c.new mplimits.c
+

 ectab.c: ectab.in ec-gentab.awk mpdump$(EXEEXT)
        $(srcdir)/ec-gentab.awk <$(srcdir)/ectab.in >ectab.c.new
        mv ectab.c.new ectab.c
 ectab.c: ectab.in ec-gentab.awk mpdump$(EXEEXT)
        $(srcdir)/ec-gentab.awk <$(srcdir)/ectab.in >ectab.c.new
        mv ectab.c.new ectab.c


@@ -174,11 +182,16 @@ pkginclude_HEADERS = \
        addsuffix(`cipher_modes', `-def.h') \
        addsuffix(`hash_modes', `-def.h') crc32.h
 
        addsuffix(`cipher_modes', `-def.h') \
        addsuffix(`hash_modes', `-def.h') crc32.h
 

+define(`MP_BASE',
+       `mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
+       mp-misc.c mp-mem.c mp-const.c mp-arith.c mp-io.c \
+       mptext.c mptext-string.c')
+

 define(`MP_SOURCES',
 define(`MP_SOURCES',

-       `mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c qdparse.c \
-       mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
+       `qdparse.c \
+       mp-test.c mplimits.c \

        mp-sqrt.c mp-gcd.c mp-jacobi.c mp-modsqrt.c mp-exp.c \
        mp-sqrt.c mp-gcd.c mp-jacobi.c mp-modsqrt.c mp-exp.c \

-       mpint.c mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
+       mpint.c mptext-file.c mptext-dstr.c \

        mptext-len.c \
        exp.c mpcrt.c mpmul.c mprand.c \
        mpbarrett.c mpbarrett-exp.c mpbarrett-mexp.c mpbarrett-exp.h \
        mptext-len.c \
        exp.c mpcrt.c mpmul.c mprand.c \
        mpbarrett.c mpbarrett-exp.c mpbarrett-mexp.c mpbarrett-exp.h \


@@ -223,7 +236,7 @@ libcatacomb_la_SOURCES = \
        passphrase.c pixie-common.c lmem.c \
        tlsprf.c sslprf.c \
        gfshare.c \
        passphrase.c pixie-common.c lmem.c \
        tlsprf.c sslprf.c \
        gfshare.c \

-       MP_SOURCES karatsuba.h \
+       MP_BASE MP_SOURCES karatsuba.h \

        gciphertab.c ghashtab.c gmactab.c \
        des-base.c des-base.h \
        desx-tab.h \
        gciphertab.c ghashtab.c gmactab.c \
        des-base.c des-base.h \
        desx-tab.h \


@@ -258,7 +271,7 @@ bin_PROGRAMS = \
 noinst_LIBRARIES = libcatcrypt.a
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
 noinst_LIBRARIES = libcatcrypt.a
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \

-       genprimes mptypes serpent-check bittest mpdump \
+       genprimes mptypes genlimits serpent-check bittest mpdump \

        perftest \
        addsuffix(`gen_tables', `-mktab')
 LDADD = libcatcrypt.a libcatacomb.la
        perftest \
        addsuffix(`gen_tables', `-mktab')
 LDADD = libcatcrypt.a libcatacomb.la


@@ -267,9 +280,10 @@ define(`LIBCAT_SRC', `cc.h getdate.h dnl
        cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
 libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
 
        cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
 libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
 

-patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
+patsubst(MP_BASE MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \

        patsubst(LIBCAT_SRC, `\.c\>', `.o'): \
        mptypes.h primetab.h
        patsubst(LIBCAT_SRC, `\.c\>', `.o'): \
        mptypes.h primetab.h

+patsubst(MP_SOURCES, `\.c\>', `.lo'): mplimits.h

        
 dsig_SOURCES = dsig.c
 cookie_SOURCES = cookie.c
        
 dsig_SOURCES = dsig.c
 cookie_SOURCES = cookie.c


@@ -301,11 +315,11 @@ genprimes_LDADD =
 mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 
 mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 

-mpdump_SOURCES = \
-       mpdump.c \
-       mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
-       mp-misc.c mp-mem.c mp-const.c mp-arith.c mp-io.c \
-       mptext.c mptext-string.c
+genlimits_SOURCES = genlimits.c MP_BASE
+genlimits_LDADD =
+genlimits_CFLAGS = $(AM_CFLAGS)
+
+mpdump_SOURCES = mpdump.c MP_BASE

 mpdump_LDADD =
 mpdump_CFLAGS = $(AM_CFLAGS)
 
 mpdump_LDADD =
 mpdump_CFLAGS = $(AM_CFLAGS)