clearing up inclusion structure for easier integration in supercop

diff --git a/Makefile b/Makefile
index 199830f074877524bfe024eafdf16fb5536af04c..59a097b5b5d8c9e9381bce1d5c3502845026b697 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ define TargetSource_Template
 $(1): $(2)
        @echo "[cc]: $(1) <-- $(2)"
        @mkdir -p $(dir $(1))
-       @$(CC) $(CFLAGS_A) -I./$(strip $(3)) -c -o $(1) $(2)
+       @$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2)
 endef
 
 # ----------------------------------------------------------------------------
@@ -92,8 +92,9 @@ $(foreach a, $(ALGORITHMS), \
   $(foreach b, $($(a)_OBJ), \
     $(eval $(call TargetSource_Template, \
       $(BIN_DIR)$(call lc, $(a))/$(b), \
-       $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
-      $($(a)_DIR) \
+      $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
+      $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR), \
+      $($(a)_DEFINES), \
     )) \
   ) \
 )
@@ -102,8 +103,9 @@ $(foreach a, $(ALGORITHMS), \
   $(foreach b, $($(a)_TEST_BIN), \
     $(eval $(call TargetSource_Template, \
       $(BIN_DIR)$(call lc, $(a))/$(TEST_DIR)$(b), \
-       $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
-      $($(a)_DIR) \
+      $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
+      $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR), \
+      $($(a)_DEFINES) \
     )) \
   ) \
 )
@@ -226,6 +228,9 @@ $(foreach algo, $(ALGORITHMS), \
        ))\
 )
 
+.PHONY: all
+all: cores
+
 .PHONY: cores
 cores: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
 

diff --git a/aes/aes_dec.c b/aes/aes_dec.c
index 778df62659fb9d93350d41cea9101b3012c2927e..8c476de0dbe70d3105eda6412befb75f334e78ba 100644 (file)
--- a/aes/aes_dec.c
+++ b/aes/aes_dec.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 #include "aes.h"
 #include "aes_invsbox.h"
 #include "aes_dec.h"

diff --git a/aes/aes_enc.c b/aes/aes_enc.c
index 7b48bbf2036c45b197c8b01abcbc7efaf43a53a0..dadf9f45a63d7d875e2bde7441a8741469392278 100644 (file)
--- a/aes/aes_enc.c
+++ b/aes/aes_enc.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "aes.h"
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 #include "aes_sbox.h"
 #include "aes_enc.h"
 #include <avr/pgmspace.h>

diff --git a/avr-makefile.inc b/avr-makefile.inc
index c2c4cd3e45a6d210afeb7d3c9175e50fca6b0d6b..3bd0a3f9c5607ce2b1127ba926178fea1bc3ce4f 100644 (file)
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,6 +1,8 @@
 
 MCU_TARGET     = atmega644
 OPTIMIZE       = -Os # -Os
+DEBUG          = -gdwarf-2
+WARNING        = -pedantic -Wall -Wstrict-prototypes
 PROGRAMMER     = avr911
 DEFS           = -D$(call uc, $(MCU_TARGET))
 FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c $(PROGRAMMER) -U flash:w:# no space at the end
@@ -27,8 +29,8 @@ AUTOASM_OPT    = -S
 CC            = avr-gcc
 CSTD           = c99
 
-override CFLAGS_A      = -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
-override CFLAGS        = -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@)) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS_A      = -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS        = -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@))   $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
 
 override LDFLAGS       = -gdwarf-2 -Wl,-Map,
 override ASFLAGS          = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2

diff --git a/base64/base64_dec.c b/base64/base64_dec.c
index 322cec0d8663dcc350c5ada57d28ca4dd4813dc6..5a0dcca292d0e1bf4f8851442ee964af811a3ba5 100644 (file)
--- a/base64/base64_dec.c
+++ b/base64/base64_dec.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include "base64_dec.h"
 
-#include "test_src/cli.h"
+#include "cli.h"
 
 /*
  #define USE_GCC_EXTENSION

diff --git a/bcal/bcal-cbc.c b/bcal/bcal-cbc.c
index 99e91aec1b051bfd6d62d904bb2b8fb3be922eea..ee27c35ff803f29d3f45787fdaabb423554a429d 100644 (file)
--- a/bcal/bcal-cbc.c
+++ b/bcal/bcal-cbc.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "bcal-cbc.h"
 #include "bcal-basic.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 uint8_t bcal_cbc_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, bcal_cbc_ctx_t* ctx){
        ctx->desc = (bcdesc_t*)desc;

diff --git a/bcal/bcal-cfb_byte.c b/bcal/bcal-cfb_byte.c
index f91f400da3260ec803749058a9cf7b31c6a121d5..e0e5d22ca57080dd01e13af83335ec895a815ad3 100644 (file)
--- a/bcal/bcal-cfb_byte.c
+++ b/bcal/bcal-cfb_byte.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "bcal-cfb_byte.h"
 #include "bcal-basic.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 uint8_t bcal_cfb_B_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, uint16_t size_b, bcal_cfb_B_ctx_t* ctx){

diff --git a/bcal/bcal-cmac.c b/bcal/bcal-cmac.c
index 5821e26e735a21e61316303f148d266db9f89ce0..abc9dfa95348f051e407023d8f8f4a64a7fafac6 100644 (file)
--- a/bcal/bcal-cmac.c
+++ b/bcal/bcal-cmac.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "bcal-basic.h"
 #include "bcal-cmac.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 static uint8_t left_shift_be_block(void* block, uint8_t blocksize_B){

diff --git a/bcal/bcal-ctr.c b/bcal/bcal-ctr.c
index 60df831bd4a9403cb65bb47b32b17e2f2b4d9b72..694cedd145d294672fba5e2d2664c85b8101d164 100644 (file)
--- a/bcal/bcal-ctr.c
+++ b/bcal/bcal-ctr.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "bcal-basic.h"
 #include "bcal-ctr.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 static void increment_be(void* block, uint8_t size_B){
        uint16_t c=1;

diff --git a/bcal/bcal-eax.c b/bcal/bcal-eax.c
index ca23e5c7d1ec66a9ce1e79c8c2aaa74b4f471780..9dceccdf6a4448226d07773dfdeb26078be3822b 100644 (file)
--- a/bcal/bcal-eax.c
+++ b/bcal/bcal-eax.c
@@ -24,7 +24,7 @@
 #include "bcal-cmac.h"
 #include "bcal-ctr.h"
 #include "bcal-eax.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 uint8_t bcal_eax_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, bcal_eax_ctx_t* ctx){
        uint8_t r;

diff --git a/bcal/bcal-ofb.c b/bcal/bcal-ofb.c
index eb1fd4d2c6176f6b5e7b27d0c856e074964899ac..d7ae757e9a485f3f908bbbae36fa0cf980f26712 100644 (file)
--- a/bcal/bcal-ofb.c
+++ b/bcal/bcal-ofb.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "bcal-ofb.h"
 #include "bcal-basic.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 uint8_t bcal_ofb_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, bcal_ofb_ctx_t* ctx){

diff --git a/bcal/bcal_noekeon.c b/bcal/bcal_noekeon.c
index 47e1c59910158a52430f21d6739938c1dce07fed..c58bdcbeee6be637a7478acf9105d2e5b984c9e5 100644 (file)
--- a/bcal/bcal_noekeon.c
+++ b/bcal/bcal_noekeon.c
@@ -3,7 +3,7 @@
 #include <avr/pgmspace.h>
 #include <stdlib.h>
 #include "blockcipher_descriptor.h"
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "keysize_descriptor.h"
 
 const char noekeon_direct_str[]   PROGMEM = "Noekeon-Direct";

diff --git a/bcal/bcal_noekeon.h b/bcal/bcal_noekeon.h
index 16a8179b46f896a58e86e1ed517e2e6113ad1953..e8ea544735fa76de4c27df4543ecafe50eaf87c9 100644 (file)
--- a/bcal/bcal_noekeon.h
+++ b/bcal/bcal_noekeon.h
@@ -2,7 +2,7 @@
 
 #include <avr/pgmspace.h>
 #include "blockcipher_descriptor.h"
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "keysize_descriptor.h"
 
 extern const bcdesc_t noekeon_direct_desc;

diff --git a/blake/blake_large.c b/blake/blake_large.c
index d2425e62c8431f51014c6a48f71193a4183993dd..af967e2555eee61a45c9b8ba9261e2a595fab4de 100644 (file)
--- a/blake/blake_large.c
+++ b/blake/blake_large.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "blake_large.h"
 #include "blake_common.h"
 

diff --git a/blake/blake_small.c b/blake/blake_small.c
index 8425ac001717b7904f4f6bfe949d5ca30b7d33e2..0f996686867c51183639e4318d79e2a327b9df63 100644 (file)
--- a/blake/blake_small.c
+++ b/blake/blake_small.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "blake_small.h"
 #include "blake_common.h"
 

diff --git a/bmw/bmw_small.c b/bmw/bmw_small.c
index 955c915c928d5747151d5f9bf2d1e2dbecd418a8..349ccf8f2c67359f9a856988e1a714f676d6d4a5 100644 (file)
--- a/bmw/bmw_small.c
+++ b/bmw/bmw_small.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "bmw_small.h"
 
 

diff --git a/cubehash/cubehash.c b/cubehash/cubehash.c
index 318d553b18bb47f22837e84e4f7989e294ad248a..0cc62b0945021f521e8bb521e9d8c61c9bc3e139 100644 (file)
--- a/cubehash/cubehash.c
+++ b/cubehash/cubehash.c
@@ -26,7 +26,7 @@
  */
 
 
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "cubehash.h"
 #include "cubehash_rotates.h"
 #include "xchg.h"

diff --git a/dsa/dsa.h b/dsa/dsa.h
index 121341c691664247e66e771f781323f7728770b9..6a894f6c8e0d487b164c6d7efb208efa1e971b5b 100644 (file)
--- a/dsa/dsa.h
+++ b/dsa/dsa.h
@@ -21,8 +21,8 @@
 #define DSA_H_
 
 #include <stdint.h>
-#include "hfal/hfal-basic.h"
-#include "bigint/bigint.h"
+#include "hfal-basic.h"
+#include "bigint.h"
 
 typedef struct{
        bigint_t p;

diff --git a/dsa/dsa_key_blob.c b/dsa/dsa_key_blob.c
index b5e2478adf4efb3308af8632914697b1057cd3b2..fe31e53d71272788cdce9713af1e993ebe0bc0a7 100644 (file)
--- a/dsa/dsa_key_blob.c
+++ b/dsa/dsa_key_blob.c
@@ -22,7 +22,7 @@
 #include <avr/pgmspace.h>
 #include "cli.h"
 #include "dsa.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 
 
 #define DSA_KEY_BLOB_SIZE 1024

diff --git a/dsa/dsa_sign.c b/dsa/dsa_sign.c
index 64552e9b60207be9d7aa873068fcf8ce769c8ad5..e9def2bd9c83136e30ebb17bd347a464311ccfd7 100644 (file)
--- a/dsa/dsa_sign.c
+++ b/dsa/dsa_sign.c
@@ -19,10 +19,10 @@
 
 #include <stdint.h>
 #include "cli.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 #include "dsa.h"
 #include "hashfunction_descriptor.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-basic.h"
 
 uint8_t dsa_sign_bigint(dsa_signature_t* s, const bigint_t* m,
                                const dsa_ctx_t* ctx, const bigint_t* k){

diff --git a/dsa/dsa_verify.c b/dsa/dsa_verify.c
index 5001b9b1caba905df05f33e04b9b84f6e62dad60..1faa68ed018f025cf52f18e7e363316c79873dbf 100644 (file)
--- a/dsa/dsa_verify.c
+++ b/dsa/dsa_verify.c
@@ -18,9 +18,9 @@
 */
 
 #include <stdint.h>
-#include "bigint/bigint.h"
+#include "bigint.h"
 #include "dsa.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-basic.h"
 
 uint8_t dsa_verify_bigint(const dsa_signature_t* s, const bigint_t* m,
                                  const dsa_ctx_t* ctx){

diff --git a/echo/echo.c b/echo/echo.c
index 407b1c5d3daab884a876dbcbcd6562c79af99d15..98ee47c771d51439f5a8dcdf577ac50c71657df0 100644 (file)
--- a/echo/echo.c
+++ b/echo/echo.c
@@ -19,8 +19,8 @@
 
 
 #include "echo.h"
-#include "gf256mul/gf256mul.h"
-#include "memxor/memxor.h"
+#include "gf256mul.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <string.h>
 

diff --git a/entropium/entropium.c b/entropium/entropium.c
index b86cd1bc581a318ab8f70c25991263ead15657ac..ed56607e2bb9af802f19c96095667897e6dbc242 100644 (file)
--- a/entropium/entropium.c
+++ b/entropium/entropium.c
@@ -48,7 +48,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "entropium.h"
 
 /**

diff --git a/groestl/groestl_large.c b/groestl/groestl_large.c
index 322e1c6e2678afc59e4f145571e2b665e72b7566..bcfd8e51ae67c81f807c466b21d7f20d7db38314 100644 (file)
--- a/groestl/groestl_large.c
+++ b/groestl/groestl_large.c
@@ -26,9 +26,9 @@
  */
 
 #include "groestl_large.h"
-#include "aes/aes_sbox.h"
-#include "gf256mul/gf256mul.h"
-#include "memxor/memxor.h"
+#include "aes_sbox.h"
+#include "gf256mul.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <avr/pgmspace.h>
 #include <string.h>

diff --git a/groestl/groestl_small.c b/groestl/groestl_small.c
index 7e59ca42313da80b80084b1579cd62136de4d9c6..44ab7eec8447de2cf5edd701ff8ec71ac86ec82a 100644 (file)
--- a/groestl/groestl_small.c
+++ b/groestl/groestl_small.c
@@ -26,9 +26,9 @@
  */
 
 #include "groestl_small.h"
-#include "aes/aes_sbox.h"
-#include "gf256mul/gf256mul.h"
-#include "memxor/memxor.h"
+#include "aes_sbox.h"
+#include "gf256mul.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <avr/pgmspace.h>
 #include <string.h>

diff --git a/hfal/hfal_sha1.c b/hfal/hfal_sha1.c
index 26128ee5f177991d21d72200e214c277f809e104..04023e7d52d318b98d1a6216946db1339f38a005 100644 (file)
--- a/hfal/hfal_sha1.c
+++ b/hfal/hfal_sha1.c
@@ -28,7 +28,7 @@
 #include <avr/pgmspace.h>
 #include <stdlib.h>
 #include "hashfunction_descriptor.h"
-#include "sha1/sha1.h"
+#include "sha1.h"
 
 static const char sha1_str[]   PROGMEM = "SHA-1";
 

diff --git a/hmac-md5/hmac-md5.c b/hmac-md5/hmac-md5.c
index 241ebcfae556bad62ebd874c10dc9ddf89be3901..d72dca9b541aed17dc5612155f264f508ea1bbe8 100644 (file)
--- a/hmac-md5/hmac-md5.c
+++ b/hmac-md5/hmac-md5.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "config.h"
-#include "md5/md5.h"
+#include "md5.h"
 #include "hmac-md5.h"
 
 #define IPAD 0x36

diff --git a/hmac-md5/hmac-md5.h b/hmac-md5/hmac-md5.h
index 6bd8e129bd67b24c39ac47000232f3116bd84c21..5bbaeb9a62f5d4ee2b88c056f86e6e5425636471 100644 (file)
--- a/hmac-md5/hmac-md5.h
+++ b/hmac-md5/hmac-md5.h
@@ -19,7 +19,7 @@
 #ifndef HMACMD5_H_
 #define HMACMD5_H_
 
-#include "md5/md5.h"
+#include "md5.h"
 
 #define HMAC_MD5_BITS        MD5_HASH_BITS
 #define HMAC_MD5_BYTES       MD5_HASH_BYTES

diff --git a/hmac-sha1/hmac-sha1.c b/hmac-sha1/hmac-sha1.c
index 783040208cca6e1ac7faf217df814aa4e170a716..56d90acc62a352b3b329dffb1280f58ecaf13abd 100644 (file)
--- a/hmac-sha1/hmac-sha1.c
+++ b/hmac-sha1/hmac-sha1.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "config.h"
-#include "sha1/sha1.h"
+#include "sha1.h"
 #include "hmac-sha1.h"
 
 #define IPAD 0x36

diff --git a/hmac-sha1/hmac-sha1.h b/hmac-sha1/hmac-sha1.h
index 78fa7c03280f4a9cccc1b382b4e787bdeec042d5..d0be0299b24fcaa19745bee15ff5bb9bc28b5c55 100644 (file)
--- a/hmac-sha1/hmac-sha1.h
+++ b/hmac-sha1/hmac-sha1.h
@@ -19,7 +19,7 @@
 #ifndef HMACSHA1_H_
 #define HMACSHA1_H_
 
-#include "sha1/sha1.h"
+#include "sha1.h"
 
 #define HMAC_SHA1_BITS        SHA1_HASH_BITS
 #define HMAC_SHA1_BYTES       SHA1_HASH_BYTES

diff --git a/hmac-sha256/hmac-sha256.c b/hmac-sha256/hmac-sha256.c
index c5e53fdf505978550350dfed407ceb4f67b453f5..6a5718906b2d6fd5aa3899f33880cf06c74d99fc 100644 (file)
--- a/hmac-sha256/hmac-sha256.c
+++ b/hmac-sha256/hmac-sha256.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "config.h"
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "hmac-sha256.h"
 
 #define IPAD 0x36

diff --git a/hmac-sha256/hmac-sha256.h b/hmac-sha256/hmac-sha256.h
index e2bd178ce7d869ae867d703d34fc700196267fbe..4df6af5e93f37f8fefd6f7a0de88e6705b30c006 100644 (file)
--- a/hmac-sha256/hmac-sha256.h
+++ b/hmac-sha256/hmac-sha256.h
@@ -19,7 +19,7 @@
 #ifndef HMACSHA256_H_
 #define HMACSHA256_H_
 
-#include "sha256/sha256.h"
+#include "sha256.h"
 
 #define HMAC_SHA256_BITS        SHA256_HASH_BITS
 #define HMAC_SHA256_BYTES       SHA256_HASH_BYTES

diff --git a/host/gf256_table_gen.c b/host/gf256_table_gen.c
index 395343a1574c9c35ff1c8b1294fabe8ed6bf013f..b3594116d95b78fb2260d19eb901fcf0ef3d452d 100644 (file)
--- a/host/gf256_table_gen.c
+++ b/host/gf256_table_gen.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 
 int print_header =  1,
     print_braces =  1,

diff --git a/host/gf256mul.c b/host/gf256mul.c
index e2d7a88a04d2086f509ea823eb66edfc4435a075..b3dd4605a44b1bd7adcffe983b8b12556077ccf2 100644 (file)
--- a/host/gf256mul.c
+++ b/host/gf256mul.c
@@ -25,7 +25,7 @@
  * 
  */
 #include <stdint.h>
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 
 uint8_t gf256mul(uint8_t a, uint8_t b, uint8_t reducer){
        uint8_t i;

diff --git a/keccak/keccak.c b/keccak/keccak.c
index 3b43a5fed43240933cb908ca74c97d3132286216..e7d5279207d434c1b7d170338814f4ffdd099fa0 100644 (file)
--- a/keccak/keccak.c
+++ b/keccak/keccak.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "rotate64.h"
 #include "keccak.h"
 

diff --git a/memxor/memxor_c.c b/memxor/memxor_c.c
index e438d5d061fdff37a72a073859da5bea789f28f8..7485b3eebb1fbc8612f5099a6dd13f33f0c63c87 100644 (file)
--- a/memxor/memxor_c.c
+++ b/memxor/memxor_c.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 void memxor(void* dest, const void* src, uint16_t n){
   while(n--){

diff --git a/mkfiles/rsa.mk b/mkfiles/rsa.mk
index 5158be98a427bff3ecf168e8520c462755326d80..aa134598b6daed3512e556e436e40db5727b60bc 100644 (file)
--- a/mkfiles/rsa.mk
+++ b/mkfiles/rsa.mk
@@ -5,7 +5,7 @@ ALGO_NAME := RSA
 PK_CIPHERS += $(ALGO_NAME)
 
 $(ALGO_NAME)_DIR      := rsa/
-$(ALGO_NAME)_INCDIR   := bigint/ noekeon/ memxor/
+$(ALGO_NAME)_INCDIR   := bigint/ noekeon/ memxor/ hfal/
 $(ALGO_NAME)_OBJ      := bigint.o bigint_io.o bigint_add_u.o rsa.o rsa_key_blob.o
 $(ALGO_NAME)_TEST_BIN := main-rsa-test.o $(CLI_STD)  \
                          noekeon_asm.o noekeon_prng.o memxor.o 

diff --git a/mqq-sign/mqq160-sign.c b/mqq-sign/mqq160-sign.c
index e49f53a745cdbe10cca5036434bb10f0a31cd0cc..2843f7b77f34c5f0827ac7466fc6be26636aeec7 100644 (file)
--- a/mqq-sign/mqq160-sign.c
+++ b/mqq-sign/mqq160-sign.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "mqq160-sign.h"
 
 #include "cli.h"

diff --git a/mqq-sign/mqq160-sign_P-stub.c b/mqq-sign/mqq160-sign_P-stub.c
index f564e0daa8ed20b5783cf3ffff66822490e2cbe4..d8c889f68ceea0868642b45e1721148492c66f2f 100644 (file)
--- a/mqq-sign/mqq160-sign_P-stub.c
+++ b/mqq-sign/mqq160-sign_P-stub.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "mqq160-sign.h"
 
 /*

diff --git a/mqq-sign/mqq160-sign_P.c b/mqq-sign/mqq160-sign_P.c
index 914a338b7f0c3b500aa95f9a44687ae594a3cf49..82c90eab0f403ae121b40aa3857df584e4b29353 100644 (file)
--- a/mqq-sign/mqq160-sign_P.c
+++ b/mqq-sign/mqq160-sign_P.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "mqq160-sign.h"
 
 static uint8_t mod20_table[32] PROGMEM = {

diff --git a/mugi/mugi.c b/mugi/mugi.c
index 87adc0116402e698abd4e88888618b344a60cd32..0be9f9af57ab5a0d63cc645c8615041cf2fe3456 100644 (file)
--- a/mugi/mugi.c
+++ b/mugi/mugi.c
@@ -29,12 +29,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "aes/aes_sbox.h"
+#include "aes_sbox.h"
 #include "mugi.h"
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 
 /*
-#include "test_src/cli.h" / * only for debugging * /
+#include "cli.h" / * only for debugging * /
 
 void dump_mugi_ctx(mugi_ctx_t* ctx){
        uint8_t i;

diff --git a/noekeon/noekeon.c b/noekeon/noekeon.c
index a800d4deeda99b51a892903ecda611a5a576bca5..f48d1e6a9b282b4da6a038a356495087d57ff6da 100644 (file)
--- a/noekeon/noekeon.c
+++ b/noekeon/noekeon.c
@@ -31,7 +31,7 @@
 #ifdef __AVR__
        #include <avr/pgmspace.h>
 #endif
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 // #include "cli.h"
 
 #define ROUND_NR 16

diff --git a/noekeon/noekeon_cbc_enc.h b/noekeon/noekeon_cbc_enc.h
index b47048f6fad3b73a48f77cffc900d16d75984237..e9ced11ff4820d77cbb335a54fcd69838cb12fad 100644 (file)
--- a/noekeon/noekeon_cbc_enc.h
+++ b/noekeon/noekeon_cbc_enc.h
@@ -2,7 +2,7 @@
 #define NOEKEON_CBC_ENC_H_
 
 #include <stdint.h>
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 
 void noekeon_cbc_enc(void* buffer, uint8_t block_cnt, const void* key);
 

diff --git a/noekeon/noekeon_ctr.h b/noekeon/noekeon_ctr.h
index 19cbe36446fa45b3c3f7fbfc4b49ba6ed1229c2c..d7a601f7d374be5541a1542a02589c44246d24e4 100644 (file)
--- a/noekeon/noekeon_ctr.h
+++ b/noekeon/noekeon_ctr.h
@@ -30,7 +30,7 @@
 #define NOEKEON_CTR_H_
 
 #include <stdint.h>
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 
 typedef struct{
        uint8_t counter[16];

diff --git a/noekeon/noekeon_prng.c b/noekeon/noekeon_prng.c
index 5e984d20a8e7a8758f1bd68395e633e745ace7c9..4e73c7cde91bad353aa327a34c5cff46c2137526 100644 (file)
--- a/noekeon/noekeon_prng.c
+++ b/noekeon/noekeon_prng.c
@@ -24,8 +24,8 @@
  * 
  */
 
-#include "noekeon/noekeon.h"
-#include "memxor/memxor.h"
+#include "noekeon.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <string.h>
 

diff --git a/noekeon/omac_noekeon.h b/noekeon/omac_noekeon.h
index c9f1067f2b374d620167dd4afb5f5654339e21f4..a4db052f6b33ab188de3b7d3a4c2f0313af56900 100644 (file)
--- a/noekeon/omac_noekeon.h
+++ b/noekeon/omac_noekeon.h
@@ -27,7 +27,7 @@
 #ifndef NOEKEON_OMAC_H_
 #define NOEKEON_OMAC_H_
 
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include <stdint.h>
 
 typedef uint8_t omac_noekeon_ctx_t[16];

diff --git a/noekeon/omac_noekeon_C.c b/noekeon/omac_noekeon_C.c
index 923fc48019223e190090e7078e393c261ace7fb5..3046ede3a29458238266e8427cb7ab5039d2dcb4 100644 (file)
--- a/noekeon/omac_noekeon_C.c
+++ b/noekeon/omac_noekeon_C.c
@@ -1,6 +1,6 @@
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "omac_noekeon.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include <string.h>
 #include <stdint.h>
 

diff --git a/rsa/rsa.c b/rsa/rsa.c
index 0281c7e18f741b2b5091145bff9e728424ef6f41..9949a721fb7364306361f1cdd24d01a8f40fc5cf 100644 (file)
--- a/rsa/rsa.c
+++ b/rsa/rsa.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include "cli.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 #include "rsa.h"
 
 uint8_t rsa_enc_bigint(bigint_t* c, const bigint_t* m,

diff --git a/rsa/rsa.h b/rsa/rsa.h
index 2d5c7729ee55736547dc8a84baee99e56e6cb536..2582399199914cc86d06d2207570edbf02550f90 100644 (file)
--- a/rsa/rsa.h
+++ b/rsa/rsa.h
@@ -21,8 +21,8 @@
 #define RSA_H_
 
 #include <stdint.h>
-#include "hfal/hfal-basic.h"
-#include "bigint/bigint.h"
+#include "hfal-basic.h"
+#include "bigint.h"
 
 
 typedef bigint_t rsa_modulus_t;

diff --git a/rsa/rsa_key_blob.c b/rsa/rsa_key_blob.c
index 1a7a6225787df41e0c86281d00f921de52d6bf41..dfe51b206cd9b5849e41c861478fb201d72b7491 100644 (file)
--- a/rsa/rsa_key_blob.c
+++ b/rsa/rsa_key_blob.c
@@ -22,7 +22,7 @@
 #include <avr/pgmspace.h>
 #include "cli.h"
 #include "rsa.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 
 #define RSA_KEYSIZE 1024
 

diff --git a/serpent/serpent.c b/serpent/serpent.c
index 41dca4bcbd4c5f9effe747d433226ef93b2ba831..40ccecd4ac58f726cea41b8bc90d8b35a2b70ac1 100644 (file)
--- a/serpent/serpent.c
+++ b/serpent/serpent.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <string.h> /* memset() */
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "serpent.h"
 #include "serpent-sboxes.h"
 

diff --git a/shabea/shabea.c b/shabea/shabea.c
index e5ca5d83fc4d6ef23d7cbf4a84ee696c2c6a2bdd..b59e138e23ca13f2569def3ac5f029649d196b3b 100644 (file)
--- a/shabea/shabea.c
+++ b/shabea/shabea.c
@@ -33,10 +33,10 @@
  */
 #include <stdlib.h>
 #include <string.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 
 #include "config.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 /*

diff --git a/shacal1/shacal1_enc.c b/shacal1/shacal1_enc.c
index 62e5cd4785358926331778f8e35818329a0a2f4b..634f18d3d42e1375d897f2353db9de57bfccf4d0 100644 (file)
--- a/shacal1/shacal1_enc.c
+++ b/shacal1/shacal1_enc.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "sha1/sha1.h"
+#include "sha1.h"
 #include "shacal1_enc.h"
 
 void shacal1_enc(void* buffer, void* key, uint16_t keysize_b){

diff --git a/shacal2/shacal2_enc.c b/shacal2/shacal2_enc.c
index c0cadcdf7e35a3a28ab0061ddfd94ddb19a2a0f2..b5380e57f3f4fefb6d54877266be7752e00e6600 100644 (file)
--- a/shacal2/shacal2_enc.c
+++ b/shacal2/shacal2_enc.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "shacal2_enc.h"
 
 

diff --git a/shacal2/shacal2_enc.h b/shacal2/shacal2_enc.h
index 3aeeafc8c461be2ca77f534f46fc09871d6d2a51..ffa277c72c05ef30c84bb8f3f8bdcc26543d1c4e 100644 (file)
--- a/shacal2/shacal2_enc.h
+++ b/shacal2/shacal2_enc.h
@@ -20,7 +20,7 @@
 #define SHACAL2_ENC_H_
 
 #include <stdint.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 
 #define SHACAL2_BLOCKSIZE  SHA256_HASH_BITS
 #define SHACAL2_BLOCKSIZE_B ((SHACAL2_BLOCKSIZE+7)/8)

diff --git a/skein/ubi1024.c b/skein/ubi1024.c
index 6e9cc4cc3ef1a71d18eeb804d75a115c33790c05..ae17cb32da35b862300faec237f8d2fb1b9c62fb 100644 (file)
--- a/skein/ubi1024.c
+++ b/skein/ubi1024.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
 void ubi1024_init(ubi1024_ctx_t* ctx, const void* g, uint8_t type){

diff --git a/skein/ubi256.c b/skein/ubi256.c
index 31523da2c06acbe854a64ae8cd4bdc6af25f2ecc..09eb1e9b2a92fbaa90275e4730680d678c27048c 100644 (file)
--- a/skein/ubi256.c
+++ b/skein/ubi256.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
 void ubi256_init(ubi256_ctx_t* ctx, const void* g, uint8_t type){

diff --git a/skein/ubi512.c b/skein/ubi512.c
index a2bd33e6d43c0b1773a097fa29e86e809c4f47a3..d6bab2d30e151464eea38cb9ed29918c45ecd52c 100644 (file)
--- a/skein/ubi512.c
+++ b/skein/ubi512.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
 void ubi512_init(ubi512_ctx_t* ctx, const void* g, uint8_t type){

diff --git a/test_src/cmacvs.c b/test_src/cmacvs.c
index 60a56c8f49d803c044ccf06697ed67830b2d6248..64bfd0b86d7cc27758a8f8c8d11566a1352b4fe8 100644 (file)
--- a/test_src/cmacvs.c
+++ b/test_src/cmacvs.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <ctype.h>
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-basic.h"
-#include "bcal/bcal-cmac.h"
+#include "bcal-basic.h"
+#include "bcal-cmac.h"
 #include "cmacvs.h"
 #include "string-extras.h"
 #include "cli.h"

diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index 88f87d5b266544e165143b8f734d046b72b8473e..8c41dd24491f28110a6ae4bc6a331ef84c63c7b9 100644 (file)
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -26,25 +26,25 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "dump.h"
 
-#include "bcal/bcal_aes128.h"
-#include "bcal/bcal_aes192.h"
-#include "bcal/bcal_aes256.h"
-#include "bcal/bcal-cbc.h"
-#include "bcal/bcal-cfb_byte.h"
-#include "bcal/bcal-cfb_bit.h"
-#include "bcal/bcal-ofb.h"
-#include "bcal/bcal-ctr.h"
-#include "bcal/bcal-cmac.h"
-#include "bcal/bcal-eax.h"
+#include "bcal_aes128.h"
+#include "bcal_aes192.h"
+#include "bcal_aes256.h"
+#include "bcal-cbc.h"
+#include "bcal-cfb_byte.h"
+#include "bcal-cfb_bit.h"
+#include "bcal-ofb.h"
+#include "bcal-ctr.h"
+#include "bcal-cmac.h"
+#include "bcal-eax.h"
 #include "cmacvs.h"
-#include "bcal/bcal-performance.h"
+#include "bcal-performance.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-aes128-test.c b/test_src/main-aes128-test.c
index 4bd2e9731f084c47a6c5cb06089838f2a3231fcd..1410d92749efca0f4d0681fab0ddec11fd1f6adc 100644 (file)
--- a/test_src/main-aes128-test.c
+++ b/test_src/main-aes128-test.c
@@ -26,13 +26,13 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_aes128.h"
+#include "bcal-performance.h"
+#include "bcal_aes128.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/test_src/main-aes192-test.c b/test_src/main-aes192-test.c
index 96fbf3e5e12499f355825eac7ec3bf4c1be8fcd9..ea92c11b035a54ec7b7c8be0885b277c58153dd0 100644 (file)
--- a/test_src/main-aes192-test.c
+++ b/test_src/main-aes192-test.c
@@ -26,13 +26,13 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_aes192.h"
+#include "bcal-performance.h"
+#include "bcal_aes192.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/test_src/main-aes256-test.c b/test_src/main-aes256-test.c
index 68a82acef40757b708402d1cf6fed91f92a56524..039a6d284f02391d0a0131d522a67be28734aec9 100644 (file)
--- a/test_src/main-aes256-test.c
+++ b/test_src/main-aes256-test.c
@@ -26,13 +26,13 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_aes256.h"
+#include "bcal-performance.h"
+#include "bcal_aes256.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/test_src/main-base64-test.c b/test_src/main-base64-test.c
index 61878744cd4d01e43491e09b09668093003ed88c..caf60fa4723864f485add9cea8836a7e3795e684 100644 (file)
--- a/test_src/main-base64-test.c
+++ b/test_src/main-base64-test.c
@@ -26,8 +26,8 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
 #include "base64_enc.h"
 #include "base64_dec.h"
 

diff --git a/test_src/main-bigint-test.c b/test_src/main-bigint-test.c
index 06d8706fc0939762035800b817888f3b7d0f2ffb..8fd41365ad308d2d4882c05b73849262b5cff4ce 100644 (file)
--- a/test_src/main-bigint-test.c
+++ b/test_src/main-bigint-test.c
@@ -26,8 +26,8 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
 #include "bigint.h"
 #include "bigint_io.h"
 

diff --git a/test_src/main-blake-test.c b/test_src/main-blake-test.c
index aec31497c77a9df0fd45c6093e63b4d310afb140..6b18c38d0c9c7593e4bb41d15e7f059e16ca6fcc 100644 (file)
--- a/test_src/main-blake-test.c
+++ b/test_src/main-blake-test.c
@@ -28,11 +28,11 @@
 
 #include "blake_small.h"
 #include "blake_large.h"
-#include "hfal/hfal_blake_small.h"
-#include "hfal/hfal_blake_large.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-test.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_blake_small.h"
+#include "hfal_blake_large.h"
+#include "hfal-nessie.h"
+#include "hfal-test.h"
+#include "hfal-performance.h"
 #include "shavs.h"
 #include "cli.h"
 #include "nessie_hash_test.h"

diff --git a/test_src/main-bmw-test.c b/test_src/main-bmw-test.c
index f46f39540a0a3d44c61c26aa84fd555ff7344e6b..2da30a0097576b1bd1737ddd9dae1e6f4f4d92e2 100644 (file)
--- a/test_src/main-bmw-test.c
+++ b/test_src/main-bmw-test.c
@@ -28,14 +28,14 @@
 #include "bmw_small.h"
 #include "bmw_large.h"
 #include "cli.h"
-#include "hfal/hfal_bmw_small.h"
-#include "hfal/hfal_bmw_large.h"
+#include "hfal_bmw_small.h"
+#include "hfal_bmw_large.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-camellia-test.c b/test_src/main-camellia-test.c
index ddcefac26b2d6b43cb79d3fbf236e3c507c29873..fb9f88170389a1f641859bca702b52d35e405a9c 100644 (file)
--- a/test_src/main-camellia-test.c
+++ b/test_src/main-camellia-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "performance_test.h"
 #include "cli.h"
-#include "bcal/bcal_camellia128.h"
-#include "bcal/bcal-performance.h"
+#include "bcal_camellia128.h"
+#include "bcal-performance.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c
index 392d8c09ecee4e9403320d8618a2b234f4d22b3a..3db72a7445a24c73c5edd367608fb49b5b37cf1a 100644 (file)
--- a/test_src/main-cast5-test.c
+++ b/test_src/main-cast5-test.c
@@ -29,8 +29,8 @@
 #include <cast5.h>
 #include "nessie_bc_test.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_cast5.h"
+#include "bcal-performance.h"
+#include "bcal_cast5.h"
 #include "cli.h"
 
 #include <stdint.h>

diff --git a/test_src/main-cast6-test.c b/test_src/main-cast6-test.c
index bc7cb735f6bfbadb3ca041920e6f2754afbd6cb8..c295b699aefb93e4bb9f49b584aaa6b9c681ce0d 100644 (file)
--- a/test_src/main-cast6-test.c
+++ b/test_src/main-cast6-test.c
@@ -12,8 +12,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_cast6.h"
+#include "bcal-performance.h"
+#include "bcal_cast6.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-cubehash-test.c b/test_src/main-cubehash-test.c
index f69868c33cc0f25d8b8ceb4be3cbf444d36cb5d3..2ae29e7cfbee56586553dab3893571770e056277 100644 (file)
--- a/test_src/main-cubehash-test.c
+++ b/test_src/main-cubehash-test.c
@@ -27,13 +27,13 @@
 
 #include "cubehash.h"
 #include "cli.h"
-#include "hfal/hfal_cubehash.h"
+#include "hfal_cubehash.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-des-test.c b/test_src/main-des-test.c
index 19ddadd6228a2bb59514af8f82e79a82457f9382..f6d237c7e58e270894049714c21b9a07311a731b 100644 (file)
--- a/test_src/main-des-test.c
+++ b/test_src/main-des-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_des.h"
+#include "bcal-performance.h"
+#include "bcal_des.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-dsa-test.c b/test_src/main-dsa-test.c
index d599b77ee7c38aa6d7bcc6eee80648325be92b7e..acbffa9e4ac0572e385da33dd43d293a81672467 100644 (file)
--- a/test_src/main-dsa-test.c
+++ b/test_src/main-dsa-test.c
@@ -26,18 +26,18 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
-#include "bigint/bigint.h"
-#include "bigint/bigint_io.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
+#include "bigint.h"
+#include "bigint_io.h"
 #include "dsa.h"
 #include "dsa_key_blob.h"
 
 #include "cli.h"
 #include "performance_test.h"
-#include "hfal/hfal_sha1.h"
-#include "base64/base64_enc.h"
-#include "base64/base64_dec.h"
+#include "hfal_sha1.h"
+#include "base64_enc.h"
+#include "base64_dec.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/test_src/main-echo-test.c b/test_src/main-echo-test.c
index 073cdd0a6690b57b9c80bc19f59d3df282b113d1..b4d81a993300afcb92b5be7e1cccbaef5965f16b 100644 (file)
--- a/test_src/main-echo-test.c
+++ b/test_src/main-echo-test.c
@@ -27,13 +27,13 @@
 
 #include "echo.h"
 #include "cli.h"
-#include "hfal/hfal_echo.h"
+#include "hfal_echo.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-groestl-test.c b/test_src/main-groestl-test.c
index ff47dc4c2a71e0edafb227e5c7b3c80020edc585..5b46497619c5af35012f94e807d6cd165ca40eb4 100644 (file)
--- a/test_src/main-groestl-test.c
+++ b/test_src/main-groestl-test.c
@@ -28,11 +28,11 @@
 
 #include "groestl_small.h"
 #include "groestl_large.h"
-#include "hfal/hfal_groestl_small.h"
-#include "hfal/hfal_groestl_large.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-test.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_groestl_small.h"
+#include "hfal_groestl_large.h"
+#include "hfal-nessie.h"
+#include "hfal-test.h"
+#include "hfal-performance.h"
 #include "shavs.h"
 #include "cli.h"
 #include "nessie_hash_test.h"

diff --git a/test_src/main-hmac-md5-test.c b/test_src/main-hmac-md5-test.c
index 0ae2d663a51caac8e575b357b09fd269f0a3ceaf..fcf6dcec1cb0b917b0192ff0b224bd2a804a359c 100644 (file)
--- a/test_src/main-hmac-md5-test.c
+++ b/test_src/main-hmac-md5-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "md5/md5.h"
+#include "md5.h"
 #include "hmac-md5.h"
 /*
 #include "base64_enc.h"

diff --git a/test_src/main-hmac-sha1-test.c b/test_src/main-hmac-sha1-test.c
index 2dc9fcc4ce259971e637d0c8967971bf4d4da2fc..538d36accc255d460524278b4e6dc4fe499bfd32 100644 (file)
--- a/test_src/main-hmac-sha1-test.c
+++ b/test_src/main-hmac-sha1-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "sha1/sha1.h"
+#include "sha1.h"
 #include "hmac-sha1.h"
 
 #include "nessie_mac_test.h"

diff --git a/test_src/main-hmac-sha256-test.c b/test_src/main-hmac-sha256-test.c
index b98fb203c6e59c3a8976eed662eaeb01dce0e20e..b6ca3fab23057b8e42335389332580c6e0b649f9 100644 (file)
--- a/test_src/main-hmac-sha256-test.c
+++ b/test_src/main-hmac-sha256-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "hmac-sha256.h"
 
 #include "cli.h"

diff --git a/test_src/main-keccak-test.c b/test_src/main-keccak-test.c
index ba66f318535839f9fe46015a0d46ed4aaaa2c0cd..80ed373bbafd5b6dce977a06c85d3e9c5645a803 100644 (file)
--- a/test_src/main-keccak-test.c
+++ b/test_src/main-keccak-test.c
@@ -27,13 +27,13 @@
 
 #include "keccak.h"
 #include "cli.h"
-#include "hfal/hfal_keccak.h"
+#include "hfal_keccak.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-md5-test.c b/test_src/main-md5-test.c
index b04635475b28d92454170f7f53c3391777d956f4..08c03cd620f2db282d761175696ed0d070418fbe 100644 (file)
--- a/test_src/main-md5-test.c
+++ b/test_src/main-md5-test.c
@@ -29,8 +29,8 @@
 #include "md5.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal_md5.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_md5.h"
+#include "hfal-performance.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index f19a91ca0ad0fd7d39ff19c6997e624c33b6c9bf..f7dbfb411138307d48e7a4cef03f0d2b8230bd32 100644 (file)
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_noekeon.h"
+#include "bcal-performance.h"
+#include "bcal_noekeon.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-omac-noekeon-test.c b/test_src/main-omac-noekeon-test.c
index 4e85268466a6b10a41859060b04a6d36a0532a2a..117a2e14fca3d2e35c8211e6b1edeb3ccfb0fe82 100644 (file)
--- a/test_src/main-omac-noekeon-test.c
+++ b/test_src/main-omac-noekeon-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "omac_noekeon.h"
 
 #include "cli.h"

diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 23d350644386e34fee5b67e26affb875f2ec94eb..96b0ff71117a1a6e5e21fc2ccc89db327af4e88c 100644 (file)
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_present.h"
+#include "bcal-performance.h"
+#include "bcal_present.h"
 
 #include <stdlib.h>
 #include <stdint.h>

diff --git a/test_src/main-rc5-test.c b/test_src/main-rc5-test.c
index 6c7da70094c45e1879329c82a073f44e01160389..95a3e06f2786ccb4ce76b011e957fb88fcb3fbac 100644 (file)
--- a/test_src/main-rc5-test.c
+++ b/test_src/main-rc5-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_rc5.h"
+#include "bcal-performance.h"
+#include "bcal_rc5.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index b7e7786582c6fc03b775fb272145fcf9f719f10c..67513adbabdd9c0e8a6caee8ab2085fe2dc3e84b 100644 (file)
--- a/test_src/main-rc6-test.c
+++ b/test_src/main-rc6-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_rc6.h"
+#include "bcal-performance.h"
+#include "bcal_rc6.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-rsa-test.c b/test_src/main-rsa-test.c
index fa71fe78275e34a0022df25daa3a1cde57fea264..3de5bac0039c7d9913a2f67324e0546e3b9cb470 100644 (file)
--- a/test_src/main-rsa-test.c
+++ b/test_src/main-rsa-test.c
@@ -26,10 +26,10 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
-#include "bigint/bigint.h"
-#include "bigint/bigint_io.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
+#include "bigint.h"
+#include "bigint_io.h"
 #include "rsa.h"
 #include "rsa_key_blob.h"
 

diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c
index 30433b8400598519fe0f364e382217cf8e7818f5..9ff4b3ff220e593123b839836634b13dfbaccec2 100644 (file)
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -35,8 +35,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_seed.h"
+#include "bcal-performance.h"
+#include "bcal_seed.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-serpent-test.c b/test_src/main-serpent-test.c
index db97c86a8c967939b79a2d26f965c34703270d45..51575b9f6d5cda26c0ab396dcca35ef95cc271b2 100644 (file)
--- a/test_src/main-serpent-test.c
+++ b/test_src/main-serpent-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_serpent.h"
+#include "bcal-performance.h"
+#include "bcal_serpent.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index d1d819e3e49de2e9d2385adb18c1a43a5375ce9e..1b19d0a948c44475ece4089e6860d588ced2ce7a 100644 (file)
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -28,15 +28,15 @@
 
 #include "sha1.h"
 #include "nessie_hash_test.h"
-#include "hfal/hfal_sha1.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_sha1.h"
+#include "hfal-performance.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
 #include "shavs.h"
-#include "hfal/hfal_sha1.h"
+#include "hfal_sha1.h"
 #include "dump.h"
 
 char* algo_name = "SHA-1";

diff --git a/test_src/main-sha256-test.c b/test_src/main-sha256-test.c
index 292a898fe51ab061ed8a9de44dce4cfc25aa35cf..1907390b21adffa7c96fe6fe71740701f1ba939d 100644 (file)
--- a/test_src/main-sha256-test.c
+++ b/test_src/main-sha256-test.c
@@ -29,15 +29,15 @@
 #include "sha256.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
 #include "shavs.h"
-#include "hfal/hfal_sha256.h"
+#include "hfal_sha256.h"
 #include "dump.h"
 
 char* algo_name = "SHA-256";

diff --git a/test_src/main-shabal-test.c b/test_src/main-shabal-test.c
index 7995df3fa42733628b6c203ed8914aa8abc2b019..bcdc57aeef20e90b94527ff138a191221ce71868 100644 (file)
--- a/test_src/main-shabal-test.c
+++ b/test_src/main-shabal-test.c
@@ -28,10 +28,10 @@
 
 #include "shabal.h"
 #include "cli.h"
-#include "hfal/hfal_shabal.h"
-#include "hfal/hfal-test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_shabal.h"
+#include "hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"

diff --git a/test_src/main-skein-test.c b/test_src/main-skein-test.c
index dc46b131b10a2dc3ad2152eb54d10c3b9fc1eaa4..2f0b04e6653e9551f5546ede339dc80e6c7f79a9 100644 (file)
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -27,16 +27,16 @@
 #include "debug.h"
 
 #include "skein.h"
-#include "hfal/hfal_skein256.h"
-#include "hfal/hfal_skein512.h"
-#include "hfal/hfal_skein1024.h"
+#include "hfal_skein256.h"
+#include "hfal_skein512.h"
+#include "hfal_skein1024.h"
 #include "cli.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
+#include "hfal-basic.h"
 
 
 #include <stdint.h>

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 2192816a7d177af595821c1d07896f87f11c25ae..3f1c75fd308b420fd8e31532c7be6ed39be695b4 100644 (file)
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_skipjack.h"
+#include "bcal-performance.h"
+#include "bcal_skipjack.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-tdes-test.c b/test_src/main-tdes-test.c
index 45861990e0a1b244e9a1b17a3e97c9792b445117..7adc19e0686179bdd484754e758271b626ab863c 100644 (file)
--- a/test_src/main-tdes-test.c
+++ b/test_src/main-tdes-test.c
@@ -30,9 +30,9 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_tdes.h"
-#include "bcal/bcal_tdes2.h"
+#include "bcal-performance.h"
+#include "bcal_tdes.h"
+#include "bcal_tdes2.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-threefish-test.c b/test_src/main-threefish-test.c
index f01aef7c837477c6ce41ef1502f14ff92386e31b..31748e45d78e47993e471c21ff8b517154cf04f1 100644 (file)
--- a/test_src/main-threefish-test.c
+++ b/test_src/main-threefish-test.c
@@ -30,10 +30,10 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_threefish256.h"
-#include "bcal/bcal_threefish512.h"
-#include "bcal/bcal_threefish1024.h"
+#include "bcal-performance.h"
+#include "bcal_threefish256.h"
+#include "bcal_threefish512.h"
+#include "bcal_threefish1024.h"
 
 #include <stdint.h>
 #include <string.h>

diff --git a/test_src/main-twister-test.c b/test_src/main-twister-test.c
index b9a47cb659304fdf0f133fb8f4a7598e07a138fd..b4efd944763823e7b4e4392cdb9d4e49ba6a93fa 100644 (file)
--- a/test_src/main-twister-test.c
+++ b/test_src/main-twister-test.c
@@ -30,13 +30,13 @@
 #include "twister-large.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal_twister224.h"
-#include "hfal/hfal_twister256.h"
-#include "hfal/hfal_twister384.h"
-#include "hfal/hfal_twister512.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal_twister224.h"
+#include "hfal_twister256.h"
+#include "hfal_twister384.h"
+#include "hfal_twister512.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 #include "shavs.h"
 
 

diff --git a/test_src/main-xtea-test.c b/test_src/main-xtea-test.c
index 6fae984d5948c90e9c53a74488064b4074170048..c40046f0cdd9cf518c936eefca9ad7183ed542ac 100644 (file)
--- a/test_src/main-xtea-test.c
+++ b/test_src/main-xtea-test.c
@@ -29,8 +29,8 @@
 #include "xtea.h"
 #include "nessie_bc_test.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_xtea.h"
+#include "bcal-performance.h"
+#include "bcal_xtea.h"
 #include "cli.h"
 
 #include <stdint.h>

diff --git a/test_src/shavs.c b/test_src/shavs.c
index 3b0b389842d50b5f99c18eff78a946f17f33a778..39b862b67899b43b1dcc5f498b7b0523ee9e94b1 100644 (file)
--- a/test_src/shavs.c
+++ b/test_src/shavs.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "hashfunction_descriptor.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-basic.h"
 #include "shavs.h"
 #include "string-extras.h"
 #include "cli.h"

diff --git a/twister/twister-large.c b/twister/twister-large.c
index 3455b5e8322b2b87c802d379d2d0bba10836b6e0..1775488ef3c128e30bb932363af4bfe892e6400a 100644 (file)
--- a/twister/twister-large.c
+++ b/twister/twister-large.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "twister.h"
 #include "twister-large.h"
 

diff --git a/twister/twister-small-stub.c b/twister/twister-small-stub.c
index 72cbe9c83ab7a60125d17bae643409b07233283b..9eb4112a933edf453b3c3a1ac8ffe5df6f44194d 100644 (file)
--- a/twister/twister-small-stub.c
+++ b/twister/twister-small-stub.c
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "twister-small.h"
 
 /*********************************************************************/

diff --git a/twister/twister-small.c b/twister/twister-small.c
index 4a05f19b2fc9c4e5aae2125a73146388c997cca2..5fb05368ce9ff7d9255d1553ad38bd06006dff6b 100644 (file)
--- a/twister/twister-small.c
+++ b/twister/twister-small.c
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "twister-small.h"
 
 /*********************************************************************/

diff --git a/twister/twister.c b/twister/twister.c
index 40f38363f9cd177cd2d654ad2ebab7bdc9d4c6d8..0135811ecc3e2503c58f2b375f3c209498d5368b 100644 (file)
--- a/twister/twister.c
+++ b/twister/twister.c
@@ -23,7 +23,7 @@
 #include <avr/pgmspace.h>
 #include "twister.h"
 #include "twister_tables.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 //#ifndef TWISTER_MUL_TABLE
 # include "gf256mul/gf256mul.h"