TEST_LIBS = libsymm.la
-VPATH += modes
+VPATH += $(srcdir)/modes
###--------------------------------------------------------------------------
### Autogenerated lists.
## we generate it using `multigen'. Unfortunately, this needs to be done
## at the Automake level, which causes some interesting bootstrapping
## problems.
+##
+## Of course, now that we have this machinery for the complicated modes
+## generation, we might as well use it for simpler things.
include modes.am
+include stubs.am
EXTRA_DIST += modes.am.in modes.am
+EXTRA_DIST += stubs.am.in stubs.am
MAINTAINERCLEANFILES += $(srcdir)/modes.am
+MAINTAINERCLEANFILES += $(srcdir)/stubs.am
## Generate the lists.
-$(srcdir)/modes.am: modes.am.in
+$(srcdir)/modes.am: modes.am.in Makefile.am
$(AM_V_GEN)$(multigen) -g $(srcdir)/modes.am.in $(srcdir)/modes.am \
blkc="$(BLKCS)" \
blkcmode="$(BLKCMODES)" \
hashmode="$(HASHMODES)" \
hashciphermode="$(HASHCIPHERMODES)" \
hashmacmode="$(HASHMACMODES)"
+$(srcdir)/stubs.am: stubs.am.in Makefile.am
+ $(AM_V_GEN)$(multigen) -g $(srcdir)/stubs.am.in $(srcdir)/stubs.am \
+ descr,hname,base="$(STUBS_HDR)" cname="$(STUBS_SRC)"
## Initialize lists of known classes.
ALL_CIPHERS = $(CIPHER_MODES)
ALL_HASHES = $(HASHES)
ALL_MACS = $(MAC_MODES)
+## Stub headers and sources.
+STUBS_HDR =
+STUBS_SRC =
+
###--------------------------------------------------------------------------
### Block ciphers.
## Schneier's `Blowfish' block cipher.
BLKCS += blowfish
-blowfish.lo: blowfish-tab.h
-CLEANFILES += blowfish-tab.h
-noinst_PROGRAMS += blowfish-mktab
+nodist_libsymm_la_SOURCES += ../precomp/symm/blowfish-tab.c
+PRECOMPS += $(precomp)/symm/blowfish-tab.c
+PRECOMP_PROGS += blowfish-mktab
blowfish_mktab_CPPFLAGS = $(AM_CPPFLAGS) -DQUIET
-blowfish-tab.h: blowfish-mktab$e
- $(AM_V_GEN)./blowfish-mktab >blowfish-tab.h.new && \
- mv blowfish-tab.h.new blowfish-tab.h
+if !CROSS_COMPILING
+$(precomp)/symm/blowfish-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) blowfish-mktab$(EXEEXT)
+ $(AM_V_GEN)./blowfish-mktab >$(precomp)/symm/blowfish-tab.c.new && \
+ mv $(precomp)/symm/blowfish-tab.c.new \
+ $(precomp)/symm/blowfish-tab.c
+endif
## Adams and Tavares' `CAST' block ciphers.
BLKCS += cast128 cast256
-libsymm_la_SOURCES += cast-s.c cast-sk.c cast-base.h cast-tab.h
-cast256.$t: t/cast256
+libsymm_la_SOURCES += cast-s.c cast-sk.c cast-base.h
+cast256.t$(EXEEXT): t/cast256
EXTRA_DIST += t/cast256.aes
MAINTAINERCLEANFILES += $(srcdir)/t/cast256
t/cast256: t/cast256.aes
## IBM's `DES' block cipher, by Feistel, Coppersmith, and others.
BLKCS += des des3
-libsymm_la_SOURCES += des-base.h des-base.c desx-tab.h
-des-base.lo: des-tab.h
-CLEANFILES += des-tab.h
-noinst_PROGRAMS += des-mktab
-des-tab.h: des-mktab$e
- $(AM_V_GEN)./des-mktab >des-tab.h.new && \
- mv des-tab.h.new des-tab.h
+libsymm_la_SOURCES += des-base.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/des-tab.c
+PRECOMPS += $(precomp)/symm/des-tab.c
+PRECOMP_PROGS += des-mktab
+if !CROSS_COMPILING
+$(precomp)/symm/des-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) des-mktab$(EXEEXT)
+ $(AM_V_GEN)./des-mktab >$(precomp)/symm/des-tab.c.new && \
+ mv $(precomp)/symm/des-tab.c.new $(precomp)/symm/des-tab.c
+endif
## Rivest's `DESX' variant, with pre- and post-whitening.
BLKCS += desx
-libsymm_la_SOURCES += desx-tab.h
+libsymm_la_SOURCES += desx-tab.c
## Lai and Massey's IDEA.
BLKCS += idea
## IBM's `MARS' block cipher.
BLKCS += mars
-mars.lo: mars-tab.h
-CLEANFILES += mars-tab.h
-noinst_PROGRAMS += mars-mktab
-mars-tab.h: mars-mktab$e
- $(AM_V_GEN)./mars-mktab >mars-tab.h.new && \
- mv mars-tab.h.new mars-tab.h
-mars.$t: t/mars
+nodist_libsymm_la_SOURCES += ../precomp/symm/mars-tab.c
+PRECOMPS += $(precomp)/symm/mars-tab.c
+PRECOMP_PROGS += mars-mktab
+if !CROSS_COMPILING
+$(precomp)/symm/mars-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) mars-mktab$(EXEEXT)
+ $(AM_V_GEN)./mars-mktab >$(precomp)/symm/mars-tab.c.new && \
+ mv $(precomp)/symm/mars-tab.c.new $(precomp)/symm/mars-tab.c
+endif
+mars.t$(EXEEXT): t/mars
EXTRA_DIST += t/mars.aes
MAINTAINERCLEANFILES += $(srcdir)/t/mars
t/mars: t/mars.aes
## Rivest's `RC2' block cipher.
BLKCS += rc2
-libsymm_la_SOURCES += rc2-tab.h
+libsymm_la_SOURCES += rc2-tab.c
## Rivest's `RC5'.
BLKCS += rc5
## Daemen and Rijmen's `Rijndael' block cipher, selected as AES.
BLKCS += rijndael rijndael192 rijndael256
libsymm_la_SOURCES += rijndael-base.h rijndael-base.c
-rijndael-base.lo: rijndael-tab.h
-CLEANFILES += rijndael-tab.h
-noinst_PROGRAMS += rijndael-mktab
-rijndael-tab.h: rijndael-mktab$e
- $(AM_V_GEN)./rijndael-mktab >rijndael-tab.h.new && \
- mv rijndael-tab.h.new rijndael-tab.h
-rijndael.$t: t/rijndael
+if CPUFAM_X86
+libsymm_la_SOURCES += rijndael-x86ish-aesni.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES += rijndael-x86ish-aesni.S
+endif
+nodist_libsymm_la_SOURCES += ../precomp/symm/rijndael-tab.c
+PRECOMPS += $(precomp)/symm/rijndael-tab.c
+PRECOMP_PROGS += rijndael-mktab
+if !CROSS_COMPILING
+$(precomp)/symm/rijndael-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) rijndael-mktab$(EXEEXT)
+ $(AM_V_GEN)./rijndael-mktab >$(precomp)/symm/rijndael-tab.c.new && \
+ mv $(precomp)/symm/rijndael-tab.c.new \
+ $(precomp)/symm/rijndael-tab.c
+endif
+rijndael.t$(EXEEXT): t/rijndael
EXTRA_DIST += t/rijndael.aes
MAINTAINERCLEANFILES += $(srcdir)/t/rijndael
t/rijndael: t/rijndael.aes
## Massey's `SAFER' block ciphers.
BLKCS += safer safersk
-safer.lo: safer-tab.h
-CLEANFILES += safer-tab.h
-noinst_PROGRAMS += safer-mktab
-safer-tab.h: safer-mktab$e
- $(AM_V_GEN)./safer-mktab >safer-tab.h.new && \
- mv safer-tab.h.new safer-tab.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/safer-tab.c
+PRECOMPS += $(precomp)/symm/safer-tab.c
+PRECOMP_PROGS += safer-mktab
+STUBS_HDR += SAFER-SK,safersk,safer
+if !CROSS_COMPILING
+$(precomp)/symm/safer-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) safer-mktab$(EXEEXT)
+ $(AM_V_GEN)./safer-mktab >$(precomp)/symm/safer-tab.c.new && \
+ mv $(precomp)/symm/safer-tab.c.new \
+ $(precomp)/symm/safer-tab.c
+endif
## Anderson, Biham and Knudsen's `Serpent' block cipher.
BLKCS += serpent
libsymm_la_SOURCES += serpent-sbox.h
-noinst_PROGRAMS += serpent-check
+check_PROGRAMS += serpent-check
TESTS += serpent-check
-serpent.$t: t/serpent
+serpent.t$(EXEEXT): t/serpent
EXTRA_DIST += t/serpent.aes
MAINTAINERCLEANFILES += $(srcdir)/t/serpent
t/serpent: t/serpent.aes
## The National Security Agency's `Skipjack' block cipher. You don't want to
## use this.
BLKCS += skipjack
-libsymm_la_SOURCES += skipjack-tab.h
+libsymm_la_SOURCES += skipjack-tab.c
## Daemen and Rijmen's `Square' block cipher.
BLKCS += square
-square.lo: square-tab.h
-CLEANFILES += square-tab.h
-noinst_PROGRAMS += square-mktab
-square-tab.h: square-mktab$e
- $(AM_V_GEN)./square-mktab >square-tab.h.new && \
- mv square-tab.h.new square-tab.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/square-tab.c
+PRECOMPS += $(precomp)/symm/square-tab.c
+PRECOMP_PROGS += square-mktab
+if !CROSS_COMPILING
+$(precomp)/symm/square-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) square-mktab$(EXEEXT)
+ $(AM_V_GEN)./square-mktab >$(precomp)/symm/square-tab.c.new && \
+ mv $(precomp)/symm/square-tab.c.new \
+ $(precomp)/symm/square-tab.c
+endif
## Wheeler and Needham's `TEA' and `XTEA' block ciphers.
BLKCS += tea xtea
## Schneier, Kelsey, Whiting, Wagner, Hall and Ferguson's `Twofish' block
## cipher.
BLKCS += twofish
-twofish.lo: twofish-tab.h
-CLEANFILES += twofish-tab.h
-noinst_PROGRAMS += twofish-mktab
-twofish-tab.h: twofish-mktab$e
- $(AM_V_GEN)./twofish-mktab >twofish-tab.h.new && \
- mv twofish-tab.h.new twofish-tab.h
-twofish.$t: t/twofish
+nodist_libsymm_la_SOURCES += ../precomp/symm/twofish-tab.c
+PRECOMPS += $(precomp)/symm/twofish-tab.c
+PRECOMP_PROGS += twofish-mktab
+if !CROSS_COMPILING
+$(precomp)/symm/twofish-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) twofish-mktab$(EXEEXT)
+ $(AM_V_GEN)./twofish-mktab >$(precomp)/symm/twofish-tab.c.new && \
+ mv $(precomp)/symm/twofish-tab.c.new \
+ $(precomp)/symm/twofish-tab.c
+endif
+twofish.t$(EXEEXT): t/twofish
EXTRA_DIST += t/twofish.aes
MAINTAINERCLEANFILES += $(srcdir)/t/twofish
t/twofish: t/twofish.aes
## Rivest's `MD' series of hash functions
HASHES += md2 md4 md5
-libsymm_la_SOURCES += md2-tab.h
+libsymm_la_SOURCES += md2-tab.c
## Dobbertin, Bosselaers and Preneel's `RIPEMD' suite.
HASHES += rmd128 rmd160 rmd256 rmd320
## The National Security Agency's `SHA-2' suite.
HASHES += sha224 sha256
HASHES += sha384 sha512
+STUBS_HDR += SHA-224,sha224,sha256
+STUBS_HDR += SHA-384,sha384,sha512
## Anderson and Biham's `Tiger' hash function.
HASHES += tiger
libsymm_la_SOURCES += tiger-base.h
-tiger.lo: tiger-tab.h
-CLEANFILES += tiger-tab.h
-noinst_PROGRAMS += tiger-mktab
-tiger-tab.h: tiger-mktab$e
- $(AM_V_GEN)./tiger-mktab >tiger-tab.h.new && \
- mv tiger-tab.h.new tiger-tab.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/tiger-tab.c
+PRECOMPS += $(precomp)/symm/tiger-tab.c
+PRECOMP_PROGS += tiger-mktab
+if !CROSS_COMPILING
+$(precomp)/symm/tiger-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) tiger-mktab$(EXEEXT)
+ $(AM_V_GEN)./tiger-mktab >$(precomp)/symm/tiger-tab.c.new && \
+ mv $(precomp)/symm/tiger-tab.c.new \
+ $(precomp)/symm/tiger-tab.c
+endif
## Barreto and Rijmen's `Whirlpool' hash function.
HASHES += whirlpool whirlpool256
-whirlpool.lo: whirlpool-tab.h
-CLEANFILES += whirlpool-tab.h
-noinst_PROGRAMS += whirlpool-mktab
-whirlpool-tab.h: whirlpool-mktab$e
- $(AM_V_GEN)./whirlpool-mktab >whirlpool-tab.h.new && \
- mv whirlpool-tab.h.new whirlpool-tab.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/whirlpool-tab.c
+PRECOMPS += $(precomp)/symm/whirlpool-tab.c
+PRECOMP_PROGS += whirlpool-mktab
+STUBS_HDR += Whirlpool-256,whirlpool256,whirlpool
+if !CROSS_COMPILING
+$(precomp)/symm/whirlpool-tab.c:
+ $(AM_V_at)$(MKDIR_P) $(precomp)/symm
+ $(AM_V_at)$(MAKE) whirlpool-mktab$(EXEEXT)
+ $(AM_V_GEN)./whirlpool-mktab \
+ >$(precomp)/symm/whirlpool-tab.c.new && \
+ mv $(precomp)/symm/whirlpool-tab.c.new \
+ $(precomp)/symm/whirlpool-tab.c
+endif
## Bellare, Canetti and Krawczyk's `HMAC' mode for message authentication.
HASHMACMODES += hmac
## Rivest's `RC4' stream cipher.
pkginclude_HEADERS += rc4.h
libsymm_la_SOURCES += rc4.c
-TESTS += rc4.$t
+TESTS += rc4.t$(EXEEXT)
EXTRA_DIST += t/rc4
ALL_CIPHERS += rc4
## Coppersmith and Rogaway's `SEAL' pseudorandom function.
pkginclude_HEADERS += seal.h
libsymm_la_SOURCES += seal.c
-TESTS += seal.$t
+TESTS += seal.t$(EXEEXT)
EXTRA_DIST += t/seal
ALL_CIPHERS += seal
+## Bernstein's `Salsa20' stream cipher. Most of the test vectors come from
+## the eSTREAM project, captured by the Internet Archive's Wayback Machine at
+##
+## http://web.archive.org/web/20070814004154/http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20.tar.gz?view=tar
+##
+## and automatically converted into the format we want.
+EXTRA_DIST += salsa20-tvconv
+pkginclude_HEADERS += salsa20.h salsa20-core.h
+libsymm_la_SOURCES += salsa20.c
+if CPUFAM_X86
+libsymm_la_SOURCES += salsa20-x86ish-sse2.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES += salsa20-x86ish-sse2.S
+endif
+TESTS += salsa20.t$(EXEEXT)
+ALL_CIPHERS += salsa20 salsa2012 salsa208
+ALL_CIPHERS += xsalsa20 xsalsa2012 xsalsa208
+STUBS_HDR += Salsa20/12,salsa2012,salsa20
+STUBS_HDR += Salsa20/8,salsa208,salsa20
+STUBS_HDR += XSalsa20,xsalsa20,salsa20
+STUBS_HDR += XSalsa20/12,xsalsa2012,salsa20
+STUBS_HDR += XSalsa20/8,xsalsa208,salsa20
+EXTRA_DIST += t/salsa20
+MAINTAINERCLEANFILES += t/salsa20
+salsa20.t$(EXEEXT): t/salsa20
+SALSA20_ESTREAM_TV = t/salsa20.estream
+SALSA20_ESTREAM_TV += t/salsa2012.estream
+SALSA20_ESTREAM_TV += t/salsa208.estream
+EXTRA_DIST += t/salsa20.local $(SALSA20_ESTREAM_TV)
+t/salsa20: salsa20-tvconv t/salsa20.local $(SALSA20_ESTREAM_TV)
+ $(AM_V_GEN)cd $(srcdir) && \
+ { echo "### GENERATED by salsa20-tvconv" && \
+ cat t/salsa20.local && \
+ ./salsa20-tvconv $(SALSA20_ESTREAM_TV); \
+ } >t/salsa20.new && \
+ mv t/salsa20.new t/salsa20
+
+## Bernstein's `ChaCha' stream cipher.
+pkginclude_HEADERS += chacha.h chacha-core.h
+libsymm_la_SOURCES += chacha.c
+if CPUFAM_X86
+libsymm_la_SOURCES += chacha-x86ish-sse2.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES += chacha-x86ish-sse2.S
+endif
+TESTS += chacha.t$(EXEEXT)
+EXTRA_DIST += t/chacha
+ALL_CIPHERS += chacha20 chacha12 chacha8
+ALL_CIPHERS += xchacha20 xchacha12 xchacha8
+STUBS_HDR += ChaCha20,chacha20,chacha
+STUBS_HDR += ChaCha12,chacha12,chacha
+STUBS_HDR += ChaCha8,chacha8,chacha
+STUBS_HDR += XChaCha20,xchacha20,chacha
+STUBS_HDR += XChaCha12,xchacha12,chacha
+STUBS_HDR += XChaCha8,xchacha8,chacha
+
###--------------------------------------------------------------------------
### Autogenerated mode implementations.
## The master stamp file, indicating that we generated all of the sources.
-CLEANFILES += modes/gen-stamp
EXTRA_DIST += mode.h.in mode.c.in
-modes/gen-stamp:
- $(AM_V_at)$(MKDIR_P) modes
+EXTRA_DIST += modes/gen-stamp
+MAINTAINERCLEANFILES += modes/gen-stamp
+modes/gen-stamp: Makefile.am
+ $(AM_V_at)$(MKDIR_P) $(srcdir)/modes
$(AM_V_GEN)$(multigen) -g $(srcdir)/mode.c.in \
- modes/@base-@mode.c \
+ $(srcdir)/modes/@base-@mode.c \
base="$(BLKCS)" mode="$(BLKCMODES)"
$(AM_V_at)$(multigen) -g $(srcdir)/mode.h.in \
- modes/@base-@mode.h \
+ $(srcdir)/modes/@base-@mode.h \
base="$(BLKCS)" mode="$(BLKCMODES)"
$(AM_V_at)$(multigen) -g $(srcdir)/mode.c.in \
- modes/@base-@mode.c \
+ $(srcdir)/modes/@base-@mode.c \
base="$(HASHES)" mode="$(HASHMODES)"
$(AM_V_at)$(multigen) -g $(srcdir)/mode.h.in \
- modes/@base-@mode.h \
+ $(srcdir)/modes/@base-@mode.h \
base="$(HASHES)" mode="$(HASHMODES)"
- $(AM_V_at)touch modes/gen-stamp
+ $(AM_V_at)touch $(srcdir)/modes/gen-stamp
## The individual mode interfaces and implementations.
pkginclude_HEADERS += $(MODE_H)
## Generated implementations.
BUILT_SOURCES += $(GENMODES_C)
-CLEANFILES += $(GENMODES_C)
-nodist_libsymm_la_SOURCES += $(GENMODES_C)
+MAINTAINERCLEANFILES += $(GENMODES_C)
+libsymm_la_SOURCES += $(GENMODES_C)
$(GENMODES_C): modes/gen-stamp
## Generated interfaces.
BUILT_SOURCES += $(GENMODES_H)
-CLEANFILES += $(GENMODES_H)
-nodist_pkginclude_HEADERS += $(GENMODES_H)
+MAINTAINERCLEANFILES += $(GENMODES_H)
+pkginclude_HEADERS += $(GENMODES_H)
$(GENMODES_H): modes/gen-stamp
###--------------------------------------------------------------------------
+### Autogenerated stub headers.
+
+## The master stamp file.
+EXTRA_DIST += stub.h.in
+EXTRA_DIST += stubs.gen-stamp
+MAINTAINERCLEANFILES += stubs.gen-stamp
+stubs.gen-stamp: Makefile.am
+ $(AM_V_at)$(MKDIR_P) $(srcdir)/stubs
+ $(AM_V_GEN)$(multigen) -g $(srcdir)/stub.h.in \
+ $(srcdir)/@name.h descr,name,base="$(STUBS_HDR)"
+ $(AM_V_GEN)$(multigen) -g $(srcdir)/stub.c.in \
+ $(srcdir)/@name.c name="$(STUBS_SRC)"
+ $(AM_V_at)touch $(srcdir)/stubs.gen-stamp
+
+## Generated stub headers.
+BUILT_SOURCES += $(STUB_H) $(STUB_C)
+MAINTAINERCLEANFILES += $(STUB_H) $(STUB_C)
+pkginclude_HEADERS += $(STUB_H)
+$(STUB_H) $(STUB_C): stubs.gen-stamp
+
+###--------------------------------------------------------------------------
### Tables of classes for encryption, hashing, and message authentication.
## The skeleton for the class tables.
pkginclude_HEADERS += gcipher.h
CLEANFILES += gciphertab.c
nodist_libsymm_la_SOURCES += gciphertab.c
-gciphertab.c: gthingtab.c.in
+gciphertab.c: gthingtab.c.in Makefile.am
$(AM_V_GEN)$(multigen) -g $(srcdir)/gthingtab.c.in gciphertab.c \
what=gcipher cls=gccipher thing="$(ALL_CIPHERS)"
pkginclude_HEADERS += ghash.h ghash-def.h
CLEANFILES += ghashtab.c
nodist_libsymm_la_SOURCES += ghashtab.c
-ghashtab.c: gthingtab.c.in
+ghashtab.c: gthingtab.c.in Makefile.am
$(AM_V_GEN)$(multigen) -g $(srcdir)/gthingtab.c.in ghashtab.c \
what=ghash cls=gchash thing="$(ALL_HASHES)"
pkginclude_HEADERS += gmac.h
CLEANFILES += gmactab.c
nodist_libsymm_la_SOURCES += gmactab.c
-gmactab.c: gthingtab.c.in
+gmactab.c: gthingtab.c.in Makefile.am
$(AM_V_GEN)$(multigen) -g $(srcdir)/gthingtab.c.in gmactab.c \
what=gmac cls=gcmac thing="$(ALL_MACS)"
EXTRA_DIST += daftstory.h
## Clean the debris from the `modes' subdirectory.
-CLEANFILES += modes/*.to modes/*.$t
+CLEANFILES += modes/*.to modes/*.t$(EXEEXT)
###----- That's all, folks --------------------------------------------------
~mdw / catacomb / blobdiff