projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add DSA files and tests.
[u/mdw/catacomb]
/
Makefile.m4
diff --git
a/Makefile.m4
b/Makefile.m4
index
ea78561
..
cb65285
100644
(file)
--- a/
Makefile.m4
+++ b/
Makefile.m4
@@
-1,6
+1,6
@@
## -*-makefile-*-
##
## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.
8 1999/11/13 01:56:07
mdw Exp $
+## $Id: Makefile.m4,v 1.
10 1999/11/19 19:28:24
mdw Exp $
##
## Makefile for Catacomb
##
##
## Makefile for Catacomb
##
@@
-29,8
+29,14
@@
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
-## Revision 1.8 1999/11/13 01:56:07 mdw
-## Include multiprecision maths stuff.
+## Revision 1.10 1999/11/19 19:28:24 mdw
+## Add DSA files and tests.
+##
+## Revision 1.10 1999/11/19 19:28:24 mdw
+## Add DSA files and tests.
+##
+## Revision 1.9 1999/11/17 18:05:35 mdw
+## Many new files and test cases for multiprecision arithmetic.
##
## Revision 1.8 1999/11/13 01:56:07 mdw
## Include multiprecision maths stuff.
##
## Revision 1.8 1999/11/13 01:56:07 mdw
## Include multiprecision maths stuff.
@@
-96,8
+102,11
@@
MODES = \
adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
$(MODES): $(srcdir)/genmodes
adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
$(MODES): $(srcdir)/genmodes
-$(srcdir)/des_sp.h: des-mktab
- ./des-mktab >$(srcdir)/des_sp.h
+ cd $(srcdir); ./genmodes "lit(`ciphers')" "lit(`cipher_modes')"
+ cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')"
+
+des_sp.h: des-mktab
+ ./des-mktab >des_sp.h
ptab.c ptab.h: genprimes
./genprimes -h ptab.h -c ptab.c -m 256 -t "unsigned char" -i ptab
ptab.c ptab.h: genprimes
./genprimes -h ptab.h -c ptab.c -m 256 -t "unsigned char" -i ptab
@@
-105,7
+114,6
@@
ptab.c ptab.h: genprimes
archinclude_HEADERS = mptypes.h
mptypes.h: mptypes
archinclude_HEADERS = mptypes.h
mptypes.h: mptypes
- des_sp.h \
./mptypes >mptypes.h
BUILT_SOURCES = \
./mptypes >mptypes.h
BUILT_SOURCES = \
@@
-127,7
+135,9
@@
define(`emit', `$1.h ')
pkginclude_HEADERS = \
paranoia.h \
blkc.h hash.h \
pkginclude_HEADERS = \
paranoia.h \
blkc.h hash.h \
- mpx.h mpw.h mpscan.h \
+ rc4.h \
+ rand.h noise.h \
+ dsa.h \
mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpmont.h \
ptab.h pgen.h rabin.h \
dsa.h dh.h \
mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpmont.h \
ptab.h pgen.h rabin.h \
dsa.h dh.h \
@@
-137,7
+147,13
@@
pkginclude_HEADERS = \
define(`emit', `$1.c ')
libcatacomb_la_SOURCES = \
des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
define(`emit', `$1.c ')
libcatacomb_la_SOURCES = \
des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
- mpx.c mpscan.c \
+ rc4.c \
+ rand.c noise.c \
+ key.c \
+ mpx.c mpscan.c mparena.c \
+ mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
+ mp-gcd.c \
+ mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
ptab.c pgen.c rabin.c \
dsa-sign.c dsa-verify.c dsa-gen.c \
dh-prime.c \
ptab.c pgen.c rabin.c \
dsa-sign.c dsa-verify.c dsa-gen.c \
dh-prime.c \
@@
-148,7
+164,7
@@
des-base.lo: des_sp.h
mpx.lo: mptypes.h
## --- Utility programs ---
mpx.lo: mptypes.h
## --- Utility programs ---
-noinst_PROGRAMS = des-mktab mptypes
+
bin_PROGRAMS = key
bin_SCRIPTS = catacomb-config
noinst_PROGRAMS = des-mktab genprimes mptypes
bin_PROGRAMS = key
bin_SCRIPTS = catacomb-config
noinst_PROGRAMS = des-mktab genprimes mptypes
@@
-156,6
+172,9
@@
LDADD = libcatacomb.la
key_SOURCES = keyutil.c getdate.y getdate.h
key_SOURCES = keyutil.c getdate.y getdate.h
+des_mktab_SOURCES = des-mktab.c
+des_mktab_LDADD =
+
genprimes_SOURCES = genprimes.c
genprimes_LDADD =
genprimes_SOURCES = genprimes.c
genprimes_LDADD =
@@
-175,25
+194,33
@@
dist-hook:
@mkdir $(distdir)/tests
@ln $(srcdir)/tests/* $(distdir)/tests || true
@rm -f $(distdir)/tests/*~
@mkdir $(distdir)/tests
@ln $(srcdir)/tests/* $(distdir)/tests || true
@rm -f $(distdir)/tests/*~
-TESTS = \
- rc4.t mpx-test.t \
- addsuffix(join(`ciphers', `-', `cipher_modes'), `.t') \
- addsuffix(join(`hashes', `-', `hash_modes'), `.t') \
- addsuffix(`ciphers', `.t') addsuffix(`hashes', `.t')
+
## --- Testing ---
## --- Testing ---
-`$1.t: $1.c libcatacomb.la
+define(`testprogs', `')
+
+define(`CTESTRIG',
`define(`testprogs', testprogs \
$1.t)dnl
$1.t: $1.c libcatacomb.la
`define(`testprogs', testprogs \
$1.t)dnl
$1.t: $1.c libcatacomb.la
-
CTESTRIG(mpx-test
)
+
$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c .libs/libcatacomb.a $(LIBS) -o $1.t'
)
+CTESTRIG(rc4)
adorn(`nl`'CTESTRIG(', `ciphers', `)')
adorn(`nl`'CTESTRIG(', `ciphers', `)')
-
adorn(`nl`'CTESTRIG(', `hashes', `)'
)
+
CTESTRIG(mpx-test
)
adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
+CTESTRIG(mpx)
+CTESTRIG(mptext)
+CTESTRIG(mp-arith)
+CTESTRIG(mp-gcd)
+CTESTRIG(mpmont)
+CTESTRIG(mpmont-mexp)
+CTESTRIG(pgen)
+CTESTRIG(dsa-gen)
+CTESTRIG(dsa-sign)
CTESTRIG(dsa-verify)
CTESTRIG(dsa-verify)
-CLEANFILES = *.t mptypes.h
+
TESTS = testprogs
CLEANFILES = *.t mptypes.h des_sp.h ptab.c ptab.h
TESTS = testprogs
CLEANFILES = *.t mptypes.h des_sp.h ptab.c ptab.h
@@
-202,8
+229,8
@@
CLEANFILES = *.t mptypes.h des_sp.h ptab.c ptab.h
$(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
$(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
- $(MODES) $(srcdir)/des_sp.h \
- $(srcdir)/getdate.c getdate.c
+
+MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.am \
$(srcdir)/getdate.c getdate.c \
$(MODES)
$(srcdir)/Makefile.am \
$(srcdir)/getdate.c getdate.c \
$(MODES)