Blame 0002-unbundle_tfm.patch
|
 |
ac5200c |
diff --git a/Makefile b/Makefile
|
|
|
ac5200c |
index cc0b9cc..19ec4da 100644
|
|
|
ac5200c |
--- a/Makefile
|
|
|
ac5200c |
+++ b/Makefile
|
|
|
ac5200c |
@@ -18,12 +18,10 @@ INTFLAGS += -DUSE_OPENSSL
|
|
|
ac5200c |
endif
|
|
|
ac5200c |
|
|
|
ac5200c |
LIBS += -ltomcrypt
|
|
|
ac5200c |
+LIBS += -ltfm
|
|
|
ac5200c |
|
|
|
ac5200c |
TARGET = pixiewps
|
|
|
ac5200c |
|
|
|
ac5200c |
-include $(SRCDIR)/crypto/tfm/sources.mak
|
|
|
ac5200c |
-TFMSRC = $(patsubst ./%,$(SRCDIR)/crypto/tfm/%,$(TFM_SRCS))
|
|
|
ac5200c |
-TFMOBJS = $(TFMSRC:.c=.o)
|
|
|
ac5200c |
TC_SRCS = ./aes_cbc.c
|
|
|
ac5200c |
TCSRC = $(patsubst ./%,$(SRCDIR)/crypto/tc/%,$(TC_SRCS))
|
|
|
ac5200c |
TCOBJS = $(TCSRC:.c=.o)
|
|
|
ac5200c |
@@ -39,9 +37,6 @@ all: $(TARGET)
|
|
|
ac5200c |
$(TARGET): $(SOURCE) $(HDRS) $(TFMOBJS) $(TCOBJS)
|
|
|
ac5200c |
$(CC) $(INTFLAGS) $(CFLAGS) $(CPPFLAGS) -o $(TARGET) $(SOURCE) $(LIBS) $(LDFLAGS) $(TFMOBJS) $(TCOBJS)
|
|
|
ac5200c |
|
|
|
ac5200c |
-$(SRCDIR)/crypto/tfm/%.o: $(SRCDIR)/crypto/tfm/%.c
|
|
|
ac5200c |
- $(CC) $(CFLAGS) $(CPPFLAGS) -I$(SRCDIR)/crypto/tfm -c -o $@ $<
|
|
|
ac5200c |
-
|
|
|
ac5200c |
$(SRCDIR)/crypto/tc/%.o: $(SRCDIR)/crypto/tc/%.c
|
|
|
ac5200c |
$(CC) $(CFLAGS) $(CPPFLAGS) -I$(SRCDIR)/crypto/tc -c -o $@ $<
|
|
|
ac5200c |
|
|
|
ac5200c |
diff --git a/src/crypto/crypto_internal-modexp.c b/src/crypto/crypto_internal-modexp.c
|
|
|
ac5200c |
index 1adf2fc..10a47fe 100644
|
|
|
ac5200c |
--- a/src/crypto/crypto_internal-modexp.c
|
|
|
ac5200c |
+++ b/src/crypto/crypto_internal-modexp.c
|
|
|
ac5200c |
@@ -1,7 +1,7 @@
|
|
|
ac5200c |
#include <stdlib.h>
|
|
|
ac5200c |
#include <stdint.h>
|
|
|
ac5200c |
|
|
|
ac5200c |
-#include "tfm/tfm.h"
|
|
|
ac5200c |
+#include <tfm.h>
|
|
|
ac5200c |
|
|
|
ac5200c |
#define u8 uint8_t
|
|
|
ac5200c |
|