symm/cbc-def.h: Fix discarding output for short inputs.

[catacomb] / symm / Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index ceefff2..3db9f3f 100644 (file)
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -32,6 +32,11 @@ nodist_libsymm_la_SOURCES =
 
 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
 
 ###--------------------------------------------------------------------------
@@ -193,6 +198,9 @@ 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
@@ -219,6 +227,7 @@ 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)/symm/safer-tab.c:
        $(AM_V_at)$(MKDIR_P) $(precomp)/symm
@@ -327,9 +336,15 @@ HASHES                     += sha
 
 ## 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
@@ -352,6 +367,7 @@ 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)/symm/whirlpool-tab.c:
        $(AM_V_at)$(MKDIR_P) $(precomp)/symm
@@ -362,6 +378,67 @@ $(precomp)/symm/whirlpool-tab.c:
                        $(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
+
 ## Bellare, Canetti and Krawczyk's `HMAC' mode for message authentication.
 HASHMACMODES           += hmac
 
@@ -408,6 +485,9 @@ 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
@@ -447,6 +527,9 @@ 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
@@ -514,6 +597,9 @@ MAINTAINERCLEANFILES        += $(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.
 
@@ -571,9 +657,13 @@ gmactab.c: gthingtab.c.in Makefile.am
 ## 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$(EXEEXT)