diff options
author | Dirk Engling <erdgeist@erdgeist.org> | 2021-01-18 18:09:01 +0100 |
---|---|---|
committer | Dirk Engling <erdgeist@erdgeist.org> | 2021-01-18 18:09:01 +0100 |
commit | 65893f92587da92fb1adc501c15d19b84ffa9089 (patch) | |
tree | 298cec360c9f6e149a787baf7d8189ffb5fc0080 /receiver.cpp | |
parent | 96f643602fde2bd3a9c759fe37d9f2ed50c218b0 (diff) | |
parent | bf583fdb2a0b8578772c2948eb9e86edc4f9dfe9 (diff) |
Fixed merge conflict
Diffstat (limited to 'receiver.cpp')
-rw-r--r-- | receiver.cpp | 3 |
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) { | |||
267 | mbedtls_entropy_context entropy; | 267 | mbedtls_entropy_context entropy; |
268 | mbedtls_pk_context pk; | 268 | mbedtls_pk_context pk; |
269 | int ret = 0, clport = PORT; | 269 | int ret = 0, clport = PORT; |
270 | unsigned char result[256]; | ||
271 | unsigned char input[256]; | ||
272 | size_t inputlen = 0; | ||
273 | char * privkey_file = 0; | 270 | char * privkey_file = 0; |
274 | char * me = argv[0]; | 271 | char * me = argv[0]; |
275 | 272 | ||