Fixed merge conflict

2 files changed, 4 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 179ba7c..8a7ed87 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,14 @@ all: sender receiver
 
 INCLUDES=/usr/local/include
 LIBS=/usr/local/lib
+CXXFLAGS=-Wall
+LDFLAGS=-lmbedtls -lmbedcrypto
 
 sender: sender.c
-        $(CC) -o sender sender.c -lmbedtls -lmbedcrypto -I$(INCLUDES) -L$(LIBS)
+        $(CC) -o sender sender.c $(LDFLAGS) -I$(INCLUDES) -L$(LIBS)
 
 receiver: receiver.cpp
-        $(CXX) -std=c++17 -o receiver receiver.cpp -lmbedtls -lmbedcrypto -I$(INCLUDES) -L$(LIBS)
+        $(CXX) -std=c++17 -o receiver receiver.cpp $(LDFLAGS) -I$(INCLUDES) -L$(LIBS) $(CXXFLAGS)
 
 test: receiver sender
         ./test-all.sh
diff --git a/receiver.cpp b/receiver.cpp
index 78e6aa7..4a0269a 100644
--- a/receiver.cpp
+++ b/receiver.cpp
@@ -267,9 +267,6 @@ int main(int argc, char **argv) {
     mbedtls_entropy_context entropy;
     mbedtls_pk_context pk;
     int ret = 0, clport = PORT;
-    unsigned char result[256];
-    unsigned char input[256];
-    size_t inputlen = 0;
     char * privkey_file = 0;
     char * me = argv[0];