update libtomcrypt, add more hashes to library.

This commit is contained in:
Kelvin Sherlock 2017-05-24 12:39:32 -04:00
parent 1bd5fc519f
commit 72ccf6a3ad
3 changed files with 29 additions and 5 deletions

View File

@ -90,6 +90,7 @@ typedef unsigned long ulong32;
#define XMEMCPY memcpy #define XMEMCPY memcpy
#define XMEMSET memset
#ifndef MAX #ifndef MAX
#define MAX(x, y) ( ((x)>(y))?(x):(y) ) #define MAX(x, y) ( ((x)>(y))?(x):(y) )
@ -110,10 +111,28 @@ typedef unsigned long ulong32;
#define LTC_ARGCHKVD(x) LTC_ARGCHK(x) #define LTC_ARGCHKVD(x) LTC_ARGCHK(x)
#if 0
/* 64-bit constants */
#define LTC_BLAKE2B
#define LTC_SHA3
#define LTC_TIGER
#define LTC_SHA512
#define LTC_WHIRLPOOL
#define LTC_CHC_HASH
#endif
#define LTC_BLAKE2S
#define LTC_MD2 #define LTC_MD2
#define LTC_MD4 #define LTC_MD4
#define LTC_MD5 #define LTC_MD5
#define LTC_RIPEMD128
#define LTC_RIPEMD160
#define LTC_RIPEMD256
#define LTC_RIPEMD320
#define LTC_SHA1 #define LTC_SHA1
#define LTC_SHA256
//#include <tomcrypt_cfg.h> //#include <tomcrypt_cfg.h>
//#include <tomcrypt_macros.h> //#include <tomcrypt_macros.h>

@ -1 +1 @@
Subproject commit 6ad52252688bb34f90b5e79da4830a927e87b81f Subproject commit 04573d8100eb60e958eca2a961a1264a7aaadebc

View File

@ -76,16 +76,21 @@ OverlayIIgs: OverlayIIgs.c.o OverlayIIgs-flags.c.o $(LIBRARIES)
LTC_H = libtomcrypt/src/hashes/ LTC_H = libtomcrypt/src/hashes/
lib/libtomcrypt : $(LTC_H)/md2.c.o $(LTC_H)/md4.c.o $(LTC_H)/md5.c.o $(LTC_H)/sha1.c.o | lib lib/libtomcrypt : \
$(LTC_H)/md2.c.o $(LTC_H)/md4.c.o $(LTC_H)/md5.c.o \
$(LTC_H)/sha1.c.o $(LTC_H)/blake2s.c.o \
$(LTC_H)/rmd128.c.o $(LTC_H)/rmd160.c.o $(LTC_H)/rmd256.c.o $(LTC_H)/rmd320.c.o \
$(LTC_H)/sha2/sha224.c.o $(LTC_H)/sha2/sha256.c.o $(LTC_H)/sha2/sha384.c.o \
| lib
$(MPW) Lib $(LIBFLAGS) -o $@ $^ $(MPW) Lib $(LIBFLAGS) -o $@ $^
$(LTC_H)%.c.o : $(LTC_H)%.c # $(LTC_H)%.c.o : $(LTC_H)%.c
$(MPW) SC $(SCFLAGS) $< -o $@ # $(MPW) --stack=0x10000 SC $(SCFLAGS) $< -o $@
%.c.o : %.c %.c.o : %.c
$(MPW) SC $(SCFLAGS) $< -o $@ $(MPW) --stack=0x10000 SC $(SCFLAGS) $< -o $@
% : %.c.o $(LIBRARIES) % : %.c.o $(LIBRARIES)
$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) $(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS)