X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_keypair.c;h=17d26f9342dfbe2542fa95fa774af1da11d046ee;hb=90cde91141ec61be4354d8deab21edb8fdf01022;hp=63f396a8653c364c52d506ae3550ab652ffa173c;hpb=49e3baec20ddad9cc297c3eeb1d13f0e421f69c8;p=tinc

diff --git a/src/sptps_keypair.c b/src/sptps_keypair.c
index 63f396a8..17d26f93 100644
--- a/src/sptps_keypair.c
+++ b/src/sptps_keypair.c
@@ -1,6 +1,6 @@
 /*
     sptps_test.c -- Simple Peer-to-Peer Security test program
-    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2022 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
@@ -19,19 +19,29 @@
 
 #include "system.h"
 
-#include <getopt.h>
-
 #include "crypto.h"
+#include "random.h"
 #include "ecdsagen.h"
-#include "utils.h"
+#include "logger.h"
+#include "names.h"
+
+void logger(debug_t level, int priority, const char *format, ...) {
+	(void)level;
+	(void)priority;
+	va_list ap;
+
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
 
-static char *program_name;
+	fputc('\n', stderr);
+}
 
-static void usage() {
+static void usage(void) {
 	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");
 }
 
@@ -40,26 +50,66 @@ static struct option const long_options[] = {
 	{NULL, 0, NULL, 0}
 };
 
+static int generate_keypair(char *argv[]) {
+	ecdsa_t *key = ecdsa_generate();
+
+	if(!key) {
+		return 1;
+	}
+
+	FILE *fp = fopen(argv[1], "w");
+
+	if(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 {
+		fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[1], strerror(errno));
+		free(key);
+		return 1;
+	}
+
+	fp = fopen(argv[2], "w");
+
+	if(fp) {
+		if(!ecdsa_write_pem_public_key(key, fp)) {
+			fprintf(stderr, "Could not write ECDSA public key\n");
+		}
+
+		free(key);
+		fclose(fp);
+		return 0;
+	} else {
+		fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[2], strerror(errno));
+		free(key);
+		return 1;
+	}
+}
+
 int main(int argc, char *argv[]) {
 	program_name = argv[0];
 	int r;
 	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;
 		}
 	}
 
@@ -72,29 +122,12 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
+	random_init();
 	crypto_init();
 
-	ecdsa_t *key = ecdsa_generate();
-	if(!key)
-		return 1;
-	
-	FILE *fp = fopen(argv[1], "w");
-	if(fp) {
-		ecdsa_write_pem_private_key(key, fp);
-		fclose(fp);
-	} else {
-		fprintf(stderr, "Could not open '%s' for writing: %s\n", strerror(errno));
-		return 1;
-	}
+	int result = generate_keypair(argv);
 
-	fp = fopen(argv[2], "w");
-	if(fp) {
-		ecdsa_write_pem_public_key(key, fp);
-		fclose(fp);
-	} else {
-		fprintf(stderr, "Could not open '%s' for writing: %s\n", strerror(errno));
-		return 1;
-	}
+	random_exit();
 
-	return 0;
+	return result;
 }