Miscellaneous fixes for stuff that broke in Linux

Conflicts: autogen.sh (source: 993f416393af9e6f8fe64091ec7385e4f9d5ccb9)

diff --git a/autogen.sh b/autogen.sh
index 1dd90c9..2cd4f71 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh +e
+
 # Run this to generate configure, the initial makefiles, etc.
 #
 # Source (non-CVS) distributions should come with a "configure" script

diff --git a/src/Makefile.am b/src/Makefile.am
index c2d14d2..9ed1c08 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ all: $(srcdir)/libtomcrypt/libtomcrypt.a $(srcdir)/libtommath/libtommath.a
 endif
 
 $(srcdir)/libtomcrypt/libtomcrypt.a: $(srcdir)/libtommath/libtommath.a
-       cd $(srcdir)/libtomcrypt && CFLAGS="$(CFLAGS) -I$(srcdir)/../libtommath -DLTM_DESC" $(MAKE)
+       cd $(srcdir)/libtomcrypt && CFLAGS="$(CFLAGS) -I$(srcdir)/../libtommath" $(MAKE)
 
 $(srcdir)/libtommath/libtommath.a:
        cd $(srcdir)/libtommath && $(MAKE)

diff --git a/src/libtomcrypt/makefile b/src/libtomcrypt/makefile
index f650ea1..143000b 100644 (file)
--- a/src/libtomcrypt/makefile
+++ b/src/libtomcrypt/makefile
@@ -30,7 +30,7 @@ endif
 endif
 
 # Compilation flags. Note the += does not write over the user's CFLAGS!
-CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -Wno-unused-parameter -DLTC_SOURCE
+CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -Wno-unused-parameter
 
 # additional warnings (newer GCC 3.4 and higher)
 ifdef GCC_34

diff --git a/src/libtomcrypt/src/ciphers/aes/aes_tab.c b/src/libtomcrypt/src/ciphers/aes/aes_tab.c
index 9057af5..e4e81ab 100644 (file)
--- a/src/libtomcrypt/src/ciphers/aes/aes_tab.c
+++ b/src/libtomcrypt/src/ciphers/aes/aes_tab.c
@@ -24,12 +24,12 @@ Td4[x] = Si[x].[01, 01, 01, 01];
 */
 
 #ifdef LTC_RIJNDAEL
-#include "tomcrypt_macros.h"
+#include "tomcrypt.h"
 
 /**
   @file aes_tab.c
   AES tables
-*/  
+*/
 static const ulong32 TE0[256] = {
     0xc66363a5UL, 0xf87c7c84UL, 0xee777799UL, 0xf67b7b8dUL,
     0xfff2f20dUL, 0xd66b6bbdUL, 0xde6f6fb1UL, 0x91c5c554UL,