Revert "build tomcrypt sha256 code as separate object"

This reverts commit e552d93a50.

Usign GCC version 5.4.0 20160609 the code was 3 times slower (probably due to missing inlining and other optimizations). The binary was also >15kB bigger.
This commit is contained in:
wiire-a 2018-01-03 21:13:00 +01:00
parent 8cce17630d
commit 1ddc765477
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@ TARGET = pixiewps
include $(SRCDIR)/crypto/tfm/sources.mak
TFMSRC = $(patsubst ./%,$(SRCDIR)/crypto/tfm/%,$(TFM_SRCS))
TFMOBJS = $(TFMSRC:.c=.o)
TC_SRCS = ./aes_cbc.c ./aes.c ./sha256.c
TC_SRCS = ./aes_cbc.c ./aes.c
TCSRC = $(patsubst ./%,$(SRCDIR)/crypto/tc/%,$(TC_SRCS))
TCOBJS = $(TCSRC:.c=.o)

View File

@ -5,7 +5,7 @@
#ifdef USE_OPENSSL
# include <openssl/sha.h>
#else
# include "tc/tomcrypt.h"
# include "tc/sha256.c"
# define SHA256_CTX hash_state
# define SHA256_Init(x) do { sha256_init(x); } while(0)
# define SHA256_Update(x, y, z) sha256_process(x, y, z)