projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused types.
[tinc]
/
src
/
sptps_keypair.c
diff --git
a/src/sptps_keypair.c
b/src/sptps_keypair.c
index
63f396a
..
4dbd2ba
100644
(file)
--- a/
src/sptps_keypair.c
+++ b/
src/sptps_keypair.c
@@
-23,15
+23,26
@@
#include "crypto.h"
#include "ecdsagen.h"
#include "crypto.h"
#include "ecdsagen.h"
-#include "utils.h"
static char *program_name;
static char *program_name;
+void logger(int level, int priority, const char *format, ...) {
+ (void)level;
+ (void)priority;
+ va_list ap;
+
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+
+ fputc('\n', stderr);
+}
+
static void usage() {
fprintf(stderr, "Usage: %s [options] private_key_file public_key_file\n\n", program_name);
fprintf(stderr, "Valid options are:\n"
static void usage() {
fprintf(stderr, "Usage: %s [options] private_key_file public_key_file\n\n", program_name);
fprintf(stderr, "Valid options are:\n"
-
" --help Display this help and exit.\n"
-
"\n");
+ " --help Display this help and exit.\n"
+ "\n");
fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
}
fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
}
@@
-46,20
+57,20
@@
int main(int argc, char *argv[]) {
int option_index = 0;
while((r = getopt_long(argc, argv, "", long_options, &option_index)) != EOF) {
int option_index = 0;
while((r = getopt_long(argc, argv, "", long_options, &option_index)) != EOF) {
- switch
(r) {
-
case 0: /* long option */
-
break;
+ switch(r) {
+ case 0: /* long option */
+ break;
-
case '?': /* wrong options */
-
usage();
-
return 1;
+ case '?': /* wrong options */
+ usage();
+ return 1;
-
case 1: /* help */
-
usage();
-
return 0;
+ case 1: /* help */
+ usage();
+ return 0;
-
default:
-
break;
+ default:
+ break;
}
}
}
}
@@
-75,26
+86,40
@@
int main(int argc, char *argv[]) {
crypto_init();
ecdsa_t *key = ecdsa_generate();
crypto_init();
ecdsa_t *key = ecdsa_generate();
- if(!key)
+
+ if(!key) {
return 1;
return 1;
-
+ }
+
FILE *fp = fopen(argv[1], "w");
FILE *fp = fopen(argv[1], "w");
+
if(fp) {
if(fp) {
- ecdsa_write_pem_private_key(key, fp);
+ if(!ecdsa_write_pem_private_key(key, fp)) {
+ fprintf(stderr, "Could not write ECDSA private key\n");
+ free(key);
+ return 1;
+ }
+
fclose(fp);
} else {
fclose(fp);
} else {
- fprintf(stderr, "Could not open '%s' for writing: %s\n", strerror(errno));
+ fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[1], strerror(errno));
+ free(key);
return 1;
}
fp = fopen(argv[2], "w");
return 1;
}
fp = fopen(argv[2], "w");
+
if(fp) {
if(fp) {
- ecdsa_write_pem_public_key(key, fp);
+ if(!ecdsa_write_pem_public_key(key, fp)) {
+ fprintf(stderr, "Could not write ECDSA public key\n");
+ }
+
+ free(key);
fclose(fp);
fclose(fp);
+ return 0;
} else {
} else {
- fprintf(stderr, "Could not open '%s' for writing: %s\n", strerror(errno));
+ fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[2], strerror(errno));
+ free(key);
return 1;
}
return 1;
}
-
- return 0;
}
}