## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
## MA 02111-1307, USA.
-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = tests
archincludedir = $(libdir)/catacomb/include
lib_LTLIBRARIES = libcatacomb.la
libcatacomb_la_LIBADD = $(CATACOMB_LIBS)
-libcatacomb_la_LDFLAGS = -version-info 3:1:1
+libcatacomb_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO)
## Middle number is the patchlevel. Final number is the minor version. The
## difference between the first and last numbers is major version.
pkginclude_HEADERS = \
- arena.h paranoia.h buf.h qdparse.h keysz.h \
+ arena.h paranoia.h buf.h ct.h qdparse.h keysz.h \
blkc.h hash.h gcipher.h ghash.h gmac.h grand.h ghash-def.h \
lcrand.h fibrand.h rc4.h seal.h rand.h noise.h fipstest.h maurer.h \
key.h key-error.h key-data.h passphrase.h pixie.h lmem.h \
mpx.h bitops.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
exp.h mpbarrett.h mpmont.h mpreduce.h mp-exp.h \
- mpcrt.h mprand.h mpmul.h \
+ mpcrt.h mprand.h mpmul.h mp-fibonacci.h \
gfx.h gf.h gfreduce.h gfn.h gf-exp.h \
primetab.h wheel.h pfilt.h rabin.h \
pgen.h primeiter.h prim.h strongprime.h limlee.h keycheck.h \
mp-sqrt.c mp-gcd.c mp-jacobi.c mp-modsqrt.c mp-exp.c mp-modexp.c \
mpint.c mptext-file.c mptext-dstr.c \
mptext-len.c \
- exp.c mpcrt.c mpmul.c mprand.c \
+ exp.c mpcrt.c mpmul.c mprand.c mp-fibonacci.c \
mpbarrett.c mpbarrett-exp.c mpbarrett-mexp.c mpbarrett-exp.h \
mpmont.c mpmont-exp.c mpmont-mexp.c mpmont-exp.h \
mpreduce.c mpreduce-exp.h \
primetab.c wheel.c share.c')
libcatacomb_la_SOURCES = \
- grand.c keysz.c keysz-conv.c \
+ grand.c ct.c keysz.c keysz-conv.c \
lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
arena.c \
passphrase.c pixie-common.c lmem.c \
## --- Utility programs ---
bin_PROGRAMS = \
- dsig key pixie cookie rspit factorial hashsum mkphrase \
+ dsig key pixie cookie rspit factorial fibonacci hashsum mkphrase \
catcrypt catsign
noinst_LIBRARIES = libcatcrypt.a
pkgconfigdir = $(libdir)/pkgconfig
LDADD = libcatcrypt.a libcatacomb.la
define(`LIBCAT_SRC', `cc.h getdate.h dnl
- cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
+ cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-hash.c \
+ cc-list.c cc-progress.c')
libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
patsubst(MP_BASE MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
hashsum_SOURCES = hashsum.c
rspit_SOURCES = rspit.c
factorial_SOURCES = factorial.c
+fibonacci_SOURCES = fibonacci.c
perftest_SOURCES = perftest.c
+perftest_LDADD = $(CATACOMB_LIBS) $(LDADD)
pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
pixie_LDADD = $(PIXIE_LIBS)
pixie_CFLAGS = $(AM_CFLAGS)
mkphrase_SOURCES = mkphrase.c
+mkphrase_LDADD = $(CATACOMB_LIBS) $(LDADD)
bittest_SOURCES = bittest.c
bittest_LDADD =
## --- Prime group keyring ---
-pkgdata_DATA = pgroups.kr
+#pkgdata_DATA = pgroups.kr
$(srcdir)/pgroups.kr: ptab.in mkpgroups
cd $(srcdir) && rm -f pgroups.kr && ./mkpgroups <ptab.in
Makefile.m4 genmodes gengctab $(man_MANS) xpixie \
group-test.c rsa-test.c \
ectab.in ec-gentab.awk \
- ptab.in p-gentab.awk mkpgroups pgroups.kr \
+ ptab.in p-gentab.awk mkpgroups \
bintab.in bin-gentab.awk \
README.cipher README.hash README.random README.mp \
debian/rules debian/copyright debian/control debian/changelog \
@for i in getdate.c gciphertab.c ghashtab.c gmactab.c; do \
ln $$i $(distdir) || ln $(srcdir)/$$i $(distdir) || true; \
done
+ echo $(VERSION) >$(distdir)/RELEASE
@echo datestamp >$(distdir)/modes-stamp || true
@for i in calc tests; do \
mkdir $(distdir)/$$i; \
CTESTRIG(mpreduce)
CTESTRIG(mpcrt)
CTESTRIG(mpmul)
+CTESTRIG(mp-fibonacci)
CTESTRIG(rsa-test)
CTESTRIG(gfx)
CTESTRIG(gfx-sqr)
CLEANFILES = \
*.t$(EXEEXT) *.to *.kr.old \
- mptypes.h primetab.c primetab.h wheel.c wheel.h \
+ mptypes.h mplimits.c mplimits.h \
+ primetab.c primetab.h wheel.c wheel.h \
ectab.c ptab.c bintab.c \
addsuffix(`gen_tables', `-tab.h')