~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup: Big pile of whitespace fixes, all at once.
[catacomb]
/
Makefile.m4
diff --git
a/Makefile.m4
b/Makefile.m4
index
fb2591d
..
5a31b5b
100644
(file)
--- a/
Makefile.m4
+++ b/
Makefile.m4
@@
-15,12
+15,12
@@
## it under the terms of the GNU Library General Public License as
## published by the Free Software Foundation; either version 2 of the
## License, or (at your option) any later version.
## it under the terms of the GNU Library General Public License as
## published by the Free Software Foundation; either version 2 of the
## License, or (at your option) any later version.
-##
+##
## Catacomb is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU Library General Public License for more details.
## Catacomb is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU Library General Public License for more details.
-##
+##
## You should have received a copy of the GNU Library General Public
## License along with Catacomb; if not, write to the Free
## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
## You should have received a copy of the GNU Library General Public
## License along with Catacomb; if not, write to the Free
## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@
-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
@@
-122,12
+130,12
@@
gciphertab.c: gengctab
$(srcdir)/gengctab gccipher gcipher >gciphertab.c.new \
"lit(join(`ciphers', `-', `cipher_modes')) \
lit(join(`hashes', `-', `_(mgf)')) \
$(srcdir)/gengctab gccipher gcipher >gciphertab.c.new \
"lit(join(`ciphers', `-', `cipher_modes')) \
lit(join(`hashes', `-', `_(mgf)')) \
- rc4 seal"
+ rc4 seal"
mv gciphertab.c.new gciphertab.c
gmactab.c: gengctab
$(srcdir)/gengctab gcmac gmac >gmactab.c.new \
mv gciphertab.c.new gciphertab.c
gmactab.c: gengctab
$(srcdir)/gengctab gcmac gmac >gmactab.c.new \
- "lit(join(`hashes', `-', `_(hmac)'))"
+ "lit(join(`hashes', `-', `_(hmac)'))"
mv gmactab.c.new gmactab.c
ghashtab.c: gengctab
mv gmactab.c.new gmactab.c
ghashtab.c: gengctab
@@
-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 \
- 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 \
+ `qdparse.c \
+ mp-
test.c mplimits
.c \
+ 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 \
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 \
@@
-202,13
+215,13
@@
define(`EC_SOURCES',
define(`PGEN_SOURCES',
`pfilt.c rabin.c \
define(`PGEN_SOURCES',
`pfilt.c rabin.c \
- pgen.c pgen-stdev.c pgen-
safe.c pgen-gcd.c prim.c strongprime
.c \
- limlee.c \
+ pgen.c pgen-stdev.c pgen-
gcd.c pgen-simul
.c \
+
prim.c strongprime.c
limlee.c \
keycheck.c keycheck-mp.c keycheck-report.c \
bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
oaep.c pkcs1.c pss.c \
keycheck.c keycheck-mp.c keycheck-report.c \
bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
oaep.c pkcs1.c pss.c \
- dh-gen.c dh-limlee.c dh-check.c dh-fetch.c dh-param.c \
+ dh-gen.c dh-limlee.c dh-
kcdsa.c dh-
check.c dh-fetch.c dh-param.c \
dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
gdsa.c gkcdsa.c \
key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
gdsa.c gkcdsa.c \
key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
@@
-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,10
+280,11
@@
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
catcrypt_SOURCES = catcrypt.c
dsig_SOURCES = dsig.c
cookie_SOURCES = cookie.c
catcrypt_SOURCES = catcrypt.c
@@
-285,7
+299,7
@@
pixie_LDADD =
pixie_CFLAGS = $(AM_CFLAGS)
mkphrase_SOURCES = mkphrase.c
bittest_SOURCES = bittest.c
pixie_CFLAGS = $(AM_CFLAGS)
mkphrase_SOURCES = mkphrase.c
bittest_SOURCES = bittest.c
-bittest_LDADD =
+bittest_LDADD =
define(`emit', `
patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_SOURCES = _item`'-mktab.c
define(`emit', `
patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_SOURCES = _item`'-mktab.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)
@@
-334,13
+348,20
@@
man_MANS = \
key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 mkphrase.1 \
keyring.5 pixie.1
key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 mkphrase.1 \
keyring.5 pixie.1
+## --- Prime group keyring ---
+
+pkgdata_DATA = pgroups.kr
+
+$(srcdir)/pgroups.kr: ptab.in mkpgroups
+ cd $(srcdir) && rm -f pgroups.kr && ./mkpgroups <ptab.in
+
## --- Other handy definitions ---
EXTRA_DIST = \
Makefile.m4 genmodes gengctab $(man_MANS) xpixie \
group-test.c rsa-test.c \
ectab.in ec-gentab.awk \
## --- Other handy definitions ---
EXTRA_DIST = \
Makefile.m4 genmodes gengctab $(man_MANS) xpixie \
group-test.c rsa-test.c \
ectab.in ec-gentab.awk \
- ptab.in p-gentab.awk \
+ ptab.in p-gentab.awk
mkpgroups pgroups.kr
\
bintab.in bin-gentab.awk \
README.cipher README.hash README.random README.mp \
debian/rules debian/copyright debian/control debian/changelog \
bintab.in bin-gentab.awk \
README.cipher README.hash README.random README.mp \
debian/rules debian/copyright debian/control debian/changelog \
@@
-392,6
+413,7
@@
CTESTRIG(mp-modsqrt)
CTESTRIG(mp-gcd)
CTESTRIG(mp-jacobi)
CTESTRIG(mp-sqrt)
CTESTRIG(mp-gcd)
CTESTRIG(mp-jacobi)
CTESTRIG(mp-sqrt)
+CTESTRIG(mp-modexp)
CTESTRIG(mptext)
CTESTRIG(mpint)
CTESTRIG(mpbarrett)
CTESTRIG(mptext)
CTESTRIG(mpint)
CTESTRIG(mpbarrett)
@@
-432,8
+454,8
@@
CTESTRIG(rho)
TESTS = serpent-check bittest testprogs
CLEANFILES = \
TESTS = serpent-check bittest testprogs
CLEANFILES = \
- *.t$(EXEEXT) *.to \
- mptypes.h primetab.c primetab.h ectab.c \
+ *.t$(EXEEXT) *.to
*.kr.old
\
+ mptypes.h primetab.c primetab.h ectab.c
ptab.c bintab.c
\
addsuffix(`gen_tables', `-tab.h')
## --- Makefile building (haha!) ---
addsuffix(`gen_tables', `-tab.h')
## --- Makefile building (haha!) ---
@@
-447,6
+469,7
@@
DISTCLEANFILES = libtool
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.am \
$(srcdir)/getdate.c getdate.c \
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.am \
$(srcdir)/getdate.c getdate.c \
+ $(srcdir)/pgroups.kr \
$(MODES) modes-stamp $(srcdir)/modes-stamp
##----- That's all, folks ---------------------------------------------------
$(MODES) modes-stamp $(srcdir)/modes-stamp
##----- That's all, folks ---------------------------------------------------