X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/ffec48800022b6872951eca188d2ceedef8dd5c8..518452dea7d3ef127aa6ea3bb7971154994e6977:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index f5d42d2..d593d8c 100644
--- 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.
-## 
+##
 ## 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,
@@ -130,12 +130,12 @@ gciphertab.c: gengctab
 	$(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 \
-		"lit(join(`hashes', `-', `_(hmac)'))" 
+		"lit(join(`hashes', `-', `_(hmac)'))"
 	mv gmactab.c.new gmactab.c
 
 ghashtab.c: gengctab
@@ -160,7 +160,7 @@ libcatacomb_la_LDFLAGS = -version-info 3:0:1
 ## difference between the first and last numbers is major version.
 
 pkginclude_HEADERS = \
-	arena.h paranoia.h buf.h qdparse.h \
+	arena.h paranoia.h buf.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 \
@@ -230,7 +230,7 @@ define(`PGEN_SOURCES',
 	primetab.c share.c')
 
 libcatacomb_la_SOURCES = \
-	grand.c keysz.c \
+	grand.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 \
@@ -284,7 +284,7 @@ patsubst(MP_BASE MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
 	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
@@ -299,7 +299,7 @@ pixie_LDADD =
 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