Browse Source

clearing up inclusion structure for easier integration in supercop

master
bg 11 years ago
parent
commit
b8d6b2bd3d
  1. 15
      Makefile
  2. 2
      aes/aes_dec.c
  3. 2
      aes/aes_enc.c
  4. 6
      avr-makefile.inc
  5. 2
      base64/base64_dec.c
  6. 2
      bcal/bcal-cbc.c
  7. 2
      bcal/bcal-cfb_byte.c
  8. 2
      bcal/bcal-cmac.c
  9. 2
      bcal/bcal-ctr.c
  10. 2
      bcal/bcal-eax.c
  11. 2
      bcal/bcal-ofb.c
  12. 2
      bcal/bcal_noekeon.c
  13. 2
      bcal/bcal_noekeon.h
  14. 2
      blake/blake_large.c
  15. 2
      blake/blake_small.c
  16. 2
      bmw/bmw_small.c
  17. 2
      cubehash/cubehash.c
  18. 4
      dsa/dsa.h
  19. 2
      dsa/dsa_key_blob.c
  20. 4
      dsa/dsa_sign.c
  21. 4
      dsa/dsa_verify.c
  22. 4
      echo/echo.c
  23. 2
      entropium/entropium.c
  24. 6
      groestl/groestl_large.c
  25. 6
      groestl/groestl_small.c
  26. 2
      hfal/hfal_sha1.c
  27. 2
      hmac-md5/hmac-md5.c
  28. 2
      hmac-md5/hmac-md5.h
  29. 2
      hmac-sha1/hmac-sha1.c
  30. 2
      hmac-sha1/hmac-sha1.h
  31. 2
      hmac-sha256/hmac-sha256.c
  32. 2
      hmac-sha256/hmac-sha256.h
  33. 2
      host/gf256_table_gen.c
  34. 2
      host/gf256mul.c
  35. 2
      keccak/keccak.c
  36. 2
      memxor/memxor_c.c
  37. 2
      mkfiles/rsa.mk
  38. 2
      mqq-sign/mqq160-sign.c
  39. 2
      mqq-sign/mqq160-sign_P-stub.c
  40. 2
      mqq-sign/mqq160-sign_P.c
  41. 6
      mugi/mugi.c
  42. 2
      noekeon/noekeon.c
  43. 2
      noekeon/noekeon_cbc_enc.h
  44. 2
      noekeon/noekeon_ctr.h
  45. 4
      noekeon/noekeon_prng.c
  46. 2
      noekeon/omac_noekeon.h
  47. 4
      noekeon/omac_noekeon_C.c
  48. 2
      rsa/rsa.c
  49. 4
      rsa/rsa.h
  50. 2
      rsa/rsa_key_blob.c
  51. 2
      serpent/serpent.c
  52. 4
      shabea/shabea.c
  53. 2
      shacal1/shacal1_enc.c
  54. 2
      shacal2/shacal2_enc.c
  55. 2
      shacal2/shacal2_enc.h
  56. 2
      skein/ubi1024.c
  57. 2
      skein/ubi256.c
  58. 2
      skein/ubi512.c
  59. 4
      test_src/cmacvs.c
  60. 24
      test_src/main-aes-test.c
  61. 6
      test_src/main-aes128-test.c
  62. 6
      test_src/main-aes192-test.c
  63. 6
      test_src/main-aes256-test.c
  64. 4
      test_src/main-base64-test.c
  65. 4
      test_src/main-bigint-test.c
  66. 10
      test_src/main-blake-test.c
  67. 10
      test_src/main-bmw-test.c
  68. 4
      test_src/main-camellia-test.c
  69. 4
      test_src/main-cast5-test.c
  70. 4
      test_src/main-cast6-test.c
  71. 8
      test_src/main-cubehash-test.c
  72. 4
      test_src/main-des-test.c
  73. 14
      test_src/main-dsa-test.c
  74. 8
      test_src/main-echo-test.c
  75. 10
      test_src/main-groestl-test.c
  76. 2
      test_src/main-hmac-md5-test.c
  77. 2
      test_src/main-hmac-sha1-test.c
  78. 2
      test_src/main-hmac-sha256-test.c
  79. 8
      test_src/main-keccak-test.c
  80. 4
      test_src/main-md5-test.c
  81. 4
      test_src/main-noekeon-test.c
  82. 2
      test_src/main-omac-noekeon-test.c
  83. 4
      test_src/main-present-test.c
  84. 4
      test_src/main-rc5-test.c
  85. 4
      test_src/main-rc6-test.c
  86. 8
      test_src/main-rsa-test.c
  87. 4
      test_src/main-seed-test.c
  88. 4
      test_src/main-serpent-test.c
  89. 6
      test_src/main-sha1-test.c
  90. 6
      test_src/main-sha256-test.c
  91. 8
      test_src/main-shabal-test.c
  92. 12
      test_src/main-skein-test.c
  93. 4
      test_src/main-skipjack-test.c
  94. 6
      test_src/main-tdes-test.c
  95. 8
      test_src/main-threefish-test.c
  96. 14
      test_src/main-twister-test.c
  97. 4
      test_src/main-xtea-test.c
  98. 2
      test_src/shavs.c
  99. 2
      twister/twister-large.c
  100. 2
      twister/twister-small-stub.c

15
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)

2
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"

2
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>

6
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

2
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

2
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;

2
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){

2
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){

2
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;

2
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;

2
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){

2
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";

2
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;

2
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"

2
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"

2
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"

2
cubehash/cubehash.c

@ -26,7 +26,7 @@
*/
#include "memxor/memxor.h"
#include "memxor.h"
#include "cubehash.h"
#include "cubehash_rotates.h"
#include "xchg.h"

4
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;

2
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

4
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){

4
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){

4
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>

2
entropium/entropium.c

@ -48,7 +48,7 @@
#include <stdint.h>
#include <string.h>
#include "sha256/sha256.h"
#include "sha256.h"
#include "entropium.h"
/**

6
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>

6
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>

2
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";

2
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

2
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

2
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

2
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

2
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

2
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

2
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,

2
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;

2
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"

2
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--){

2
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

2
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"

2
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"
/*

2
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 = {

6
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;

2
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

2
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);

2
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];

4
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>

2
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];

4
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>

2
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,

4
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;

2
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

2
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"

4
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"
/*

2
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){

2
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"

2
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)

2
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){

2
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){

2
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){

4
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"

24
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>

6
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>

6
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>

6
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>

4
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"

4
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"

10
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"

10
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>

4
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>

4
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>

4
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>

8
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>

4
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>

14
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>

8
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>

10
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"

2
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"

2
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"

2
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"

8
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>

4
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>

4
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>

2
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"

4
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>

4
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>

4
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>

8
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"

4
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>

4
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>

6
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";

6
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";

8
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"
#