Fixed merge conflict

1 files changed, 0 insertions, 3 deletions

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];