projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'seehuhn/1.1' into 1.1
[tinc]
/
src
/
sptps_test.c
diff --git
a/src/sptps_test.c
b/src/sptps_test.c
index
1fb7f97
..
38c2c08
100644
(file)
--- a/
src/sptps_test.c
+++ b/
src/sptps_test.c
@@
-1,6
+1,6
@@
/*
sptps_test.c -- Simple Peer-to-Peer Security test program
/*
sptps_test.c -- Simple Peer-to-Peer Security test program
- Copyright (C) 2011-201
3 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2011-201
4 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-43,7
+43,7
@@
static bool writeonly;
static int in = 0;
static int out = 1;
static int in = 0;
static int out = 1;
-static bool send_data(void *handle, uint8_t type, const
char
*data, size_t len) {
+static bool send_data(void *handle, uint8_t type, const
void
*data, size_t len) {
char hex[len * 2 + 1];
bin2hex(data, hex, len);
if(verbose)
char hex[len * 2 + 1];
bin2hex(data, hex, len);
if(verbose)
@@
-54,7
+54,7
@@
static bool send_data(void *handle, uint8_t type, const char *data, size_t len)
return true;
}
return true;
}
-static bool receive_record(void *handle, uint8_t type, const
char
*data, uint16_t len) {
+static bool receive_record(void *handle, uint8_t type, const
void
*data, uint16_t len) {
if(verbose)
fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
if(!writeonly)
if(verbose)
fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
if(!writeonly)
@@
-271,11
+271,19
@@
int main(int argc, char *argv[]) {
crypto_init();
FILE *fp = fopen(argv[1], "r");
crypto_init();
FILE *fp = fopen(argv[1], "r");
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[1], strerror(errno));
+ return 1;
+ }
if(!(mykey = ecdsa_read_pem_private_key(fp)))
return 1;
fclose(fp);
fp = fopen(argv[2], "r");
if(!(mykey = ecdsa_read_pem_private_key(fp)))
return 1;
fclose(fp);
fp = fopen(argv[2], "r");
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+ return 1;
+ }
if(!(hiskey = ecdsa_read_pem_public_key(fp)))
return 1;
fclose(fp);
if(!(hiskey = ecdsa_read_pem_public_key(fp)))
return 1;
fclose(fp);