TEST_LIBS = libsymm.la
+noinst_LTLIBRARIES += libsymmtest.la
+libsymmtest_la_SOURCES =
+libsymmtest_la_CFLAGS = $(AM_CFLAGS) -DSRCDIR=\"$(srcdir)\"
+TEST_LIBS += libsymmtest.la
+
VPATH += $(srcdir)/modes
###--------------------------------------------------------------------------
## 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)" \
blkcciphermode="$(BLKCCIPHERMODES)" \
+ blkcaeadmode="$(BLKCAEADMODES)" \
+ blkcmacmode="$(BLKCMACMODES)" \
hash="$(HASHES)" \
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,cbase="$(STUBS_SRC)"
## Initialize lists of known classes.
ALL_CIPHERS = $(CIPHER_MODES)
+ALL_AEADS = $(AEAD_MODES)
ALL_HASHES = $(HASHES)
ALL_MACS = $(MAC_MODES)
+## Stub headers and sources.
+STUBS_HDR =
+STUBS_SRC =
+
###--------------------------------------------------------------------------
### Block ciphers.
BLKCCIPHERMODES =
BLKCMODES += $(BLKCCIPHERMODES)
+BLKCAEADMODES =
+BLKCMODES += $(BLKCAEADMODES)
+
+BLKCMACMODES =
+BLKCMODES += $(BLKCMACMODES)
+
## A tool for translating the AES-contest test vectors into a form our test
## rigs understand.
EXTRA_DIST += aes-trans
## Schneier's `Blowfish' block cipher.
BLKCS += blowfish
-libsymm_la_SOURCES += $(precomp)/blowfish-tab.c
-PRECOMPS += $(precomp)/blowfish-tab.c
+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
if !CROSS_COMPILING
-$(precomp)/blowfish-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) blowfish-mktab$e
- $(AM_V_GEN)./blowfish-mktab >$(precomp)/blowfish-tab.c.new && \
- mv $(precomp)/blowfish-tab.c.new $(precomp)/blowfish-tab.c
+$(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
-cast256.$t: t/cast256
-EXTRA_DIST += t/cast256.aes
+cast256.log: t/cast256
+EXTRA_DIST += t/cast256.aes t/cast256.local
MAINTAINERCLEANFILES += $(srcdir)/t/cast256
-t/cast256: t/cast256.aes
- $(AM_V_GEN)$(srcdir)/aes-trans CAST256 \
- <$(srcdir)/t/cast256.aes \
- >$(srcdir)/t/cast256.new && \
- mv $(srcdir)/t/cast256.new $(srcdir)/t/cast256
+t/cast256: t/cast256.aes t/cast256.local
+ $(AM_V_GEN)cd $(srcdir) && \
+ { ./aes-trans CAST256 <t/cast256.aes && \
+ cat t/cast256.local; \
+ } >t/cast256.new && \
+ mv t/cast256.new t/cast256
## IBM's `DES' block cipher, by Feistel, Coppersmith, and others.
BLKCS += des des3
-libsymm_la_SOURCES += des-base.h $(precomp)/des-tab.c
-PRECOMPS += $(precomp)/des-tab.c
+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)/des-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) des-mktab$e
- $(AM_V_GEN)./des-mktab >$(precomp)/des-tab.c.new && \
- mv $(precomp)/des-tab.c.new $(precomp)/des-tab.c
+$(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.
## IBM's `MARS' block cipher.
BLKCS += mars
-libsymm_la_SOURCES += $(precomp)/mars-tab.c
-PRECOMPS += $(precomp)/mars-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/mars-tab.c
+PRECOMPS += $(precomp)/symm/mars-tab.c
PRECOMP_PROGS += mars-mktab
if !CROSS_COMPILING
-$(precomp)/mars-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) mars-mktab$e
- $(AM_V_GEN)./mars-mktab >$(precomp)/mars-tab.c.new && \
- mv $(precomp)/mars-tab.c.new $(precomp)/mars-tab.c
+$(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: t/mars
-EXTRA_DIST += t/mars.aes
+mars.log: t/mars
+EXTRA_DIST += t/mars.aes t/mars.local
MAINTAINERCLEANFILES += $(srcdir)/t/mars
-t/mars: t/mars.aes
- $(AM_V_GEN)$(srcdir)/aes-trans Mars \
- <$(srcdir)/t/mars.aes \
- >$(srcdir)/t/mars.new && \
- mv $(srcdir)/t/mars.new $(srcdir)/t/mars
+t/mars: t/mars.aes t/mars.local
+ $(AM_V_GEN)cd $(srcdir) && \
+ { ./aes-trans Mars <t/mars.aes && \
+ cat t/mars.local; \
+ } >t/mars.new && \
+ mv t/mars.new t/mars
## Daemen, Peeters, Van Assche and Rijmen's `Noekeon'.
BLKCS += noekeon
## Daemen and Rijmen's `Rijndael' block cipher, selected as AES.
BLKCS += rijndael rijndael192 rijndael256
libsymm_la_SOURCES += rijndael-base.h rijndael-base.c
-libsymm_la_SOURCES += $(precomp)/rijndael-tab.c
-PRECOMPS += $(precomp)/rijndael-tab.c
+if CPUFAM_X86
+libsymm_la_SOURCES += rijndael-x86ish-aesni.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES += rijndael-x86ish-aesni.S
+endif
+if HAVE_AS_ARMV8_CRYPTO
+if CPUFAM_ARMEL
+libsymm_la_SOURCES += rijndael-arm-crypto.S
+endif
+endif
+if CPUFAM_ARM64
+libsymm_la_SOURCES += rijndael-arm64-crypto.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)/rijndael-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) rijndael-mktab$e
- $(AM_V_GEN)./rijndael-mktab >$(precomp)/rijndael-tab.c.new && \
- mv $(precomp)/rijndael-tab.c.new $(precomp)/rijndael-tab.c
+$(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: t/rijndael
-EXTRA_DIST += t/rijndael.aes
+rijndael.log: t/rijndael
+EXTRA_DIST += t/rijndael.aes t/rijndael.local
MAINTAINERCLEANFILES += $(srcdir)/t/rijndael
-t/rijndael: t/rijndael.aes
- $(AM_V_GEN)$(srcdir)/aes-trans Rijndael \
- <$(srcdir)/t/rijndael.aes \
- >$(srcdir)/t/rijndael.new && \
- mv $(srcdir)/t/rijndael.new $(srcdir)/t/rijndael
+t/rijndael: t/rijndael.aes t/rijndael.local
+ $(AM_V_GEN)cd $(srcdir) && \
+ { ./aes-trans Rijndael <t/rijndael.aes && \
+ cat t/rijndael.local; \
+ } >t/rijndael.new && \
+ mv t/rijndael.new t/rijndael
## Massey's `SAFER' block ciphers.
BLKCS += safer safersk
-libsymm_la_SOURCES += $(precomp)/safer-tab.c
-PRECOMPS += $(precomp)/safer-tab.c
+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
+STUBS_SRC += safersk,safer
if !CROSS_COMPILING
-$(precomp)/safer-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) safer-mktab$e
- $(AM_V_GEN)./safer-mktab >$(precomp)/safer-tab.c.new && \
- mv $(precomp)/safer-tab.c.new $(precomp)/safer-tab.c
+$(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.
libsymm_la_SOURCES += serpent-sbox.h
check_PROGRAMS += serpent-check
TESTS += serpent-check
-serpent.$t: t/serpent
-EXTRA_DIST += t/serpent.aes
+serpent.log: t/serpent
+EXTRA_DIST += t/serpent.aes t/serpent.local
MAINTAINERCLEANFILES += $(srcdir)/t/serpent
-t/serpent: t/serpent.aes
- $(AM_V_GEN)$(srcdir)/aes-trans Serpent -v rev=1 \
- <$(srcdir)/t/serpent.aes \
- >$(srcdir)/t/serpent.new && \
- mv $(srcdir)/t/serpent.new $(srcdir)/t/serpent
+t/serpent: t/serpent.aes t/serpent.local
+ $(AM_V_GEN)cd $(srcdir) && \
+ { ./aes-trans Serpent -v rev=1 <t/serpent.aes && \
+ cat t/serpent.local; \
+ } >t/serpent.new && \
+ mv t/serpent.new t/serpent
## The National Security Agency's `Skipjack' block cipher. You don't want to
## use this.
## Daemen and Rijmen's `Square' block cipher.
BLKCS += square
-libsymm_la_SOURCES += $(precomp)/square-tab.c
-PRECOMPS += $(precomp)/square-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/square-tab.c
+PRECOMPS += $(precomp)/symm/square-tab.c
PRECOMP_PROGS += square-mktab
if !CROSS_COMPILING
-$(precomp)/square-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) square-mktab$e
- $(AM_V_GEN)./square-mktab >$(precomp)/square-tab.c.new && \
- mv $(precomp)/square-tab.c.new $(precomp)/square-tab.c
+$(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.
## Schneier, Kelsey, Whiting, Wagner, Hall and Ferguson's `Twofish' block
## cipher.
BLKCS += twofish
-libsymm_la_SOURCES += $(precomp)/twofish-tab.c
-PRECOMPS += $(precomp)/twofish-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/twofish-tab.c
+PRECOMPS += $(precomp)/symm/twofish-tab.c
PRECOMP_PROGS += twofish-mktab
if !CROSS_COMPILING
-$(precomp)/twofish-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) twofish-mktab$e
- $(AM_V_GEN)./twofish-mktab >$(precomp)/twofish-tab.c.new && \
- mv $(precomp)/twofish-tab.c.new $(precomp)/twofish-tab.c
+$(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: t/twofish
-EXTRA_DIST += t/twofish.aes
+twofish.log: t/twofish
+EXTRA_DIST += t/twofish.aes t/twofish.local
MAINTAINERCLEANFILES += $(srcdir)/t/twofish
-t/twofish: t/twofish.aes
- $(AM_V_GEN)$(srcdir)/aes-trans Twofish \
- <$(srcdir)/t/twofish.aes \
- >$(srcdir)/t/twofish.new && \
- mv $(srcdir)/t/twofish.new $(srcdir)/t/twofish
+t/twofish: t/twofish.aes t/twofish.local
+ $(AM_V_GEN)cd $(srcdir) && \
+ { ./aes-trans Twofish <t/twofish.aes && \
+ cat t/twofish.local; \
+ } >t/twofish.new && \
+ mv t/twofish.new t/twofish
## The old NIST modes for DES.
BLKCCIPHERMODES += cbc cfb ecb ofb
## Counter mode.
BLKCCIPHERMODES += counter
+## CMAC mode.
+BLKCMACMODES += cmac pmac1
+
+## Various AEAD modes.
+pkginclude_HEADERS += ocb.h
+BLKCAEADMODES += ccm eax gcm ocb1 ocb3
+libsymm_la_SOURCES += ccm.c gcm.c ocb.c
+if CPUFAM_X86
+libsymm_la_SOURCES += gcm-x86ish-pclmul.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES += gcm-x86ish-pclmul.S
+endif
+if CPUFAM_ARMEL
+libsymm_la_SOURCES += gcm-arm-crypto.S
+endif
+if CPUFAM_ARM64
+libsymm_la_SOURCES += gcm-arm64-pmull.S
+endif
+
+TESTS += gcm.t$(EXEEXT)
+EXTRA_DIST += t/gcm
+
###--------------------------------------------------------------------------
### Hash functions.
## The National Security Agency's `SHA-2' suite.
HASHES += sha224 sha256
-HASHES += sha384 sha512
+HASHES += sha384 sha512 sha512/224 sha512/256
+STUBS_HDR += SHA-224,sha224,sha256
+STUBS_HDR += SHA-384,sha384,sha512
+STUBS_HDR += SHA-512/256,sha512-256,sha512
+STUBS_HDR += SHA-512/224,sha512-224,sha512
+STUBS_SRC += sha224,sha256
+STUBS_SRC += sha384,sha512
+STUBS_SRC += sha512-256,sha512
+STUBS_SRC += sha512-224,sha512
## Anderson and Biham's `Tiger' hash function.
HASHES += tiger
-libsymm_la_SOURCES += tiger-base.h $(precomp)/tiger-tab.c
-PRECOMPS += $(precomp)/tiger-tab.c
+libsymm_la_SOURCES += tiger-base.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/tiger-tab.c
+PRECOMPS += $(precomp)/symm/tiger-tab.c
PRECOMP_PROGS += tiger-mktab
if !CROSS_COMPILING
-$(precomp)/tiger-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) tiger-mktab$e
- $(AM_V_GEN)./tiger-mktab >$(precomp)/tiger-tab.c.new && \
- mv $(precomp)/tiger-tab.c.new $(precomp)/tiger-tab.c
+$(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
-libsymm_la_SOURCES += $(precomp)/whirlpool-tab.c
-PRECOMPS += $(precomp)/whirlpool-tab.c
+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
+STUBS_SRC += whirlpool256,whirlpool
if !CROSS_COMPILING
-$(precomp)/whirlpool-tab.c:
- $(AM_V_at)$(MKDIR_P) $(precomp)
- $(AM_V_at)$(MAKE) whirlpool-mktab$e
- $(AM_V_GEN)./whirlpool-mktab >$(precomp)/whirlpool-tab.c.new && \
- mv $(precomp)/whirlpool-tab.c.new $(precomp)/whirlpool-tab.c
+$(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
+## Bertoni, Daemen, Peeters, and Van Assche's `Keccak', selected as the basis
+## for SHA-3.
+pkginclude_HEADERS += keccak1600.h
+libsymm_la_SOURCES += keccak1600.c
+TESTS += keccak1600.t$(EXEEXT)
+EXTRA_DIST += t/keccak1600
+
+pkginclude_HEADERS += sha3.h
+libsymm_la_SOURCES += sha3.c
+
+HASHES += sha3-224 sha3-256 sha3-384 sha3-512
+STUBS_HDR += SHA3-224,sha3-224,sha3
+STUBS_HDR += SHA3-256,sha3-256,sha3
+STUBS_HDR += SHA3-384,sha3-384,sha3
+STUBS_HDR += SHA3-512,sha3-512,sha3
+STUBS_SRC += sha3-224,sha3
+STUBS_SRC += sha3-256,sha3
+STUBS_SRC += sha3-384,sha3
+STUBS_SRC += sha3-512,sha3
+
+STUBS_HDR += SHAKE128,shake128,sha3
+STUBS_HDR += SHAKE256,shake256,sha3
+
+STUBS_HDR += SHAKE128-XOF,shake128-xof,sha3
+STUBS_HDR += SHAKE256-XOF,shake256-xof,sha3
+
+STUBS_HDR += KMAC128,kmac128,sha3
+STUBS_HDR += KMAC256,kmac256,sha3
+
+ALL_HASHES += shake128 shake256
+ALL_CIPHERS += shake128-xof shake256-xof
+ALL_MACS += kmac128 kmac256
+
+TESTS += sha3.t$(EXEEXT)
+SHA3_TESTS = t/SHA3_224ShortMsg.rsp
+SHA3_TESTS += t/SHA3_224LongMsg.rsp
+SHA3_TESTS += t/SHA3_256ShortMsg.rsp
+SHA3_TESTS += t/SHA3_256LongMsg.rsp
+SHA3_TESTS += t/SHA3_384ShortMsg.rsp
+SHA3_TESTS += t/SHA3_384LongMsg.rsp
+SHA3_TESTS += t/SHA3_512ShortMsg.rsp
+SHA3_TESTS += t/SHA3_512LongMsg.rsp
+SHA3_TESTS += t/SHA3_224Monte.rsp
+SHA3_TESTS += t/SHA3_256Monte.rsp
+SHA3_TESTS += t/SHA3_384Monte.rsp
+SHA3_TESTS += t/SHA3_512Monte.rsp
+SHA3_TESTS += t/SHAKE128ShortMsg.rsp
+SHA3_TESTS += t/SHAKE128LongMsg.rsp
+SHA3_TESTS += t/SHAKE128VariableOut.rsp
+SHA3_TESTS += t/SHAKE256ShortMsg.rsp
+SHA3_TESTS += t/SHAKE256LongMsg.rsp
+SHA3_TESTS += t/SHAKE256VariableOut.rsp
+EXTRA_DIST += $(SHA3_TESTS) sha3-trans t/sha3.local t/sha3
+MAINTAINERCLEANFILES += $(srcdir)/t/sha3
+sha3.log: t/sha3
+$(srcdir)/t/sha3: $(SHA3_TESTS) sha3-trans t/sha3.local
+ $(AM_V_GEN)cd $(srcdir) && \
+ { ./sha3-trans $(SHA3_TESTS); \
+ cat t/sha3.local; } >t/sha3.new && \
+ mv t/sha3.new t/sha3
+
+## Mike Hamburg's STROBE protocol framework.
+pkginclude_HEADERS += strobe.h
+libsymm_la_SOURCES += strobe.c
+TESTS += strobe.t$(EXEEXT)
+EXTRA_DIST += t/strobe
+
## 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
+if CPUFAM_ARMEL
+libsymm_la_SOURCES += salsa20-arm-neon.S
+endif
+if CPUFAM_ARM64
+libsymm_la_SOURCES += salsa20-arm64.S
+endif
+TESTS += salsa20.t$(EXEEXT)
+ALL_CIPHERS += salsa20 salsa2012 salsa208
+ALL_CIPHERS += salsa20-ietf salsa2012-ietf salsa208-ietf
+ALL_CIPHERS += xsalsa20 xsalsa2012 xsalsa208
+STUBS_HDR += Salsa20/12,salsa2012,salsa20
+STUBS_HDR += Salsa20/8,salsa208,salsa20
+STUBS_HDR += Salsa20-IETF,salsa20-ietf,salsa20
+STUBS_HDR += Salsa20/12-IETF,salsa2012-ietf,salsa20
+STUBS_HDR += Salsa20/8-IETF,salsa208-ietf,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.log: 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
+if CPUFAM_ARMEL
+libsymm_la_SOURCES += chacha-arm-neon.S
+endif
+if CPUFAM_ARM64
+libsymm_la_SOURCES += chacha-arm64.S
+endif
+TESTS += chacha.t$(EXEEXT)
+EXTRA_DIST += t/chacha
+ALL_CIPHERS += chacha20 chacha12 chacha8
+ALL_CIPHERS += chacha20-ietf chacha12-ietf chacha8-ietf
+ALL_CIPHERS += xchacha20 xchacha12 xchacha8
+STUBS_HDR += ChaCha20,chacha20,chacha
+STUBS_HDR += ChaCha12,chacha12,chacha
+STUBS_HDR += ChaCha8,chacha8,chacha
+STUBS_HDR += ChaCha20-IETF,chacha20-ietf,chacha
+STUBS_HDR += ChaCha12-IETF,chacha12-ietf,chacha
+STUBS_HDR += ChaCha8-IETF,chacha8-ietf,chacha
+STUBS_HDR += XChaCha20,xchacha20,chacha
+STUBS_HDR += XChaCha12,xchacha12,chacha
+STUBS_HDR += XChaCha8,xchacha8,chacha
+
+## Bernstein's `Poly1305' message authentication code.
+pkginclude_HEADERS += poly1305.h
+libsymm_la_SOURCES += poly1305.c
+TESTS += poly1305.t$(EXEEXT)
+TESTS += poly1305-p11.t$(EXEEXT)
+EXTRA_DIST += t/poly1305 t/poly1305.slow
+
+check_PROGRAMS += poly1305-p11.t
+poly1305_p11_t_SOURCES = poly1305.c
+poly1305_p11_t_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_RIG -DSRCDIR="\"$(srcdir)\""
+poly1305_p11_t_CPPFLAGS += -DPOLY1305_IMPL=11
+poly1305_p11_t_LDFLAGS = $(TEST_LDFLAGS)
+poly1305_p11_t_LDADD = $(TEST_LIBS) $(top_builddir)/libcatacomb.la
+poly1305_p11_t_LDADD += $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
+
+## Combining Salsa20/ChaCha with Poly1305.
+pkginclude_HEADERS += latinpoly.h latinpoly-def.h
+libsymm_la_SOURCES += latinpoly.c chacha-poly1305.c salsa20-poly1305.c
+libsymmtest_la_SOURCES += latinpoly-test.c latinpoly-test.h
+
+ALL_AEADS += chacha20-poly1305 salsa20-poly1305
+ALL_AEADS += chacha12-poly1305 salsa2012-poly1305
+ALL_AEADS += chacha8-poly1305 salsa208-poly1305
+ALL_AEADS += chacha20-naclbox salsa20-naclbox
+ALL_AEADS += chacha12-naclbox salsa2012-naclbox
+ALL_AEADS += chacha8-naclbox salsa208-naclbox
+STUBS_HDR += ChaCha20-Poly1305,chacha20-poly1305,latinpoly
+STUBS_HDR += ChaCha12-Poly1305,chacha12-poly1305,latinpoly
+STUBS_HDR += ChaCha8-Poly1305,chacha8-poly1305,latinpoly
+STUBS_HDR += Salsa20-Poly1305,salsa20-poly1305,latinpoly
+STUBS_HDR += Salsa20/12-Poly1305,salsa2012-poly1305,latinpoly
+STUBS_HDR += Salsa20/8-Poly1305,salsa208-poly1305,latinpoly
+STUBS_HDR += ChaCha20-NaClBox,chacha20-naclbox,latinpoly
+STUBS_HDR += ChaCha12-NaClBox,chacha12-naclbox,latinpoly
+STUBS_HDR += ChaCha8-NaClBox,chacha8-naclbox,latinpoly
+STUBS_HDR += Salsa20-NaClBox,salsa20-naclbox,latinpoly
+STUBS_HDR += Salsa20/12-NaClBox,salsa2012-naclbox,latinpoly
+STUBS_HDR += Salsa20/8-NaClBox,salsa208-naclbox,latinpoly
+TESTS += chacha-poly1305.t$(EXEEXT)
+TESTS += salsa20-poly1305.t$(EXEEXT)
+
###--------------------------------------------------------------------------
### Autogenerated mode implementations.
EXTRA_DIST += mode.h.in mode.c.in
EXTRA_DIST += modes/gen-stamp
MAINTAINERCLEANFILES += modes/gen-stamp
-modes/gen-stamp:
+modes/gen-stamp: Makefile.am
$(AM_V_at)$(MKDIR_P) $(srcdir)/modes
$(AM_V_GEN)$(multigen) -g $(srcdir)/mode.c.in \
- $(srcdir)/modes/@base-@mode.c \
+ $(srcdir)/modes/@{base:f}-@mode.c \
base="$(BLKCS)" mode="$(BLKCMODES)"
$(AM_V_at)$(multigen) -g $(srcdir)/mode.h.in \
- $(srcdir)/modes/@base-@mode.h \
+ $(srcdir)/modes/@{base:f}-@mode.h \
base="$(BLKCS)" mode="$(BLKCMODES)"
$(AM_V_at)$(multigen) -g $(srcdir)/mode.c.in \
- $(srcdir)/modes/@base-@mode.c \
+ $(srcdir)/modes/@{base:f}-@mode.c \
base="$(HASHES)" mode="$(HASHMODES)"
$(AM_V_at)$(multigen) -g $(srcdir)/mode.h.in \
- $(srcdir)/modes/@base-@mode.h \
+ $(srcdir)/modes/@{base:f}-@mode.h \
base="$(HASHES)" mode="$(HASHMODES)"
$(AM_V_at)touch $(srcdir)/modes/gen-stamp
## Generated implementations.
BUILT_SOURCES += $(GENMODES_C)
-EXTRA_DIST += $(GENMODES_C)
MAINTAINERCLEANFILES += $(GENMODES_C)
-nodist_libsymm_la_SOURCES += $(GENMODES_C)
+libsymm_la_SOURCES += $(GENMODES_C)
$(GENMODES_C): modes/gen-stamp
## Generated interfaces.
BUILT_SOURCES += $(GENMODES_H)
-EXTRA_DIST += $(GENMODES_H)
MAINTAINERCLEANFILES += $(GENMODES_H)
-nodist_pkginclude_HEADERS += $(GENMODES_H)
+pkginclude_HEADERS += $(GENMODES_H)
$(GENMODES_H): modes/gen-stamp
+## Additional test machinery.
+libsymmtest_la_SOURCES += modes-test.c modes-test.h
+
+###--------------------------------------------------------------------------
+### 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,base="$(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.
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)"
+## Table of AEAD classes.
+pkginclude_HEADERS += gaead.h
+CLEANFILES += gaeadtab.c
+libsymm_la_SOURCES += gaead.c
+nodist_libsymm_la_SOURCES += gaeadtab.c
+gaeadtab.c: gthingtab.c.in Makefile.am
+ $(AM_V_GEN)$(multigen) -g $(srcdir)/gthingtab.c.in gaeadtab.c \
+ what=gaead cls=gcaead thing="$(ALL_AEADS)"
+
## Table of hash classes.
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)"
## Run the test programs.
TESTS += $(SYMM_TESTS)
EXTRA_DIST += $(SYMM_TEST_FILES)
+EXTRA_DIST += $(REGRESSION_TEST_FILES)
-## A piece of sample text for round-trip testing encryption modes.
-EXTRA_DIST += daftstory.h
+t/modes/%.regress:
+ $(MAKE) modes/$*.t && \
+ mkdir -p $(srcdir)/t/modes/ && \
+ modes/$*.t -o$(srcdir)/$@.new && \
+ mv $(srcdir)/$@.new $(srcdir)/$@
## 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