X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fkeys.c;h=84bd07198e4de0f71a03fd2428a1d6062a6ac4e0;hb=76de8e3924fc36e5a3e906741bf640dceb846800;hp=dacb87b3973b46e1da5261e6af70a1709a18b12e;hpb=9e917cc3b614d7a986416e6a2c3ea9ea583adacf;p=tinc

diff --git a/src/keys.c b/src/keys.c
index dacb87b3..84bd0719 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -79,7 +79,7 @@ bool disable_old_keys(const char *filename, const char *what) {
 			return false;
 		}
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 		// We cannot atomically replace files on Windows.
 		char bakfile[PATH_MAX] = "";
 		snprintf(bakfile, sizeof(bakfile), "%s.bak", filename);
@@ -95,7 +95,7 @@ bool disable_old_keys(const char *filename, const char *what) {
 			return false;
 		}
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 		unlink(bakfile);
 #endif
 		fprintf(stderr, "Warning: old key(s) found and disabled.\n");
@@ -128,12 +128,13 @@ ecdsa_t *read_ecdsa_private_key(splay_tree_t *config_tree, char **keyfile) {
 		return NULL;
 	}
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 	struct stat s;
 
 	if(fstat(fileno(fp), &s)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat Ed25519 private key file `%s': %s'", fname, strerror(errno));
 		free(fname);
+		fclose(fp);
 		return false;
 	}
 
@@ -171,7 +172,7 @@ bool read_ecdsa_public_key(ecdsa_t **ecdsa, splay_tree_t **config_tree, const ch
 	char *p;
 
 	if(!*config_tree) {
-		init_configuration(config_tree);
+		*config_tree = create_configuration();
 
 		if(!read_host_config(*config_tree, name, true)) {
 			return false;
@@ -227,13 +228,13 @@ rsa_t *read_rsa_private_key(splay_tree_t *config_tree, char **keyfile) {
 	if(get_config_string(rsa_priv_conf, &d)) {
 		if(!get_config_string(lookup_config(config_tree, "PublicKey"), &n)) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "PrivateKey used but no PublicKey found!");
-			free(d);
+			free_string(d);
 			return NULL;
 		}
 
 		key = rsa_set_hex_private_key(n, "FFFF", d);
 		free(n);
-		free(d);
+		free_string(d);
 
 		if(key && keyfile && rsa_priv_conf->file) {
 			*keyfile = xstrdup(rsa_priv_conf->file);
@@ -262,12 +263,13 @@ rsa_t *read_rsa_private_key(splay_tree_t *config_tree, char **keyfile) {
 		return NULL;
 	}
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 	struct stat s;
 
 	if(fstat(fileno(fp), &s)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat RSA private key file `%s': %s'", fname, strerror(errno));
 		free(fname);
+		fclose(fp);
 		return NULL;
 	}
 
@@ -295,7 +297,7 @@ rsa_t *read_rsa_private_key(splay_tree_t *config_tree, char **keyfile) {
 	return key;
 }
 
-bool read_rsa_public_key(rsa_t **rsa, splay_tree_t *config_tree, const char *name) {
+rsa_t *read_rsa_public_key(splay_tree_t *config_tree, const char *name) {
 	FILE *fp;
 	char *fname;
 	char *n;
@@ -303,9 +305,9 @@ bool read_rsa_public_key(rsa_t **rsa, splay_tree_t *config_tree, const char *nam
 	/* First, check for simple PublicKey statement */
 
 	if(get_config_string(lookup_config(config_tree, "PublicKey"), &n)) {
-		*rsa = rsa_set_hex_public_key(n, "FFFF");
+		rsa_t *rsa = rsa_set_hex_public_key(n, "FFFF");
 		free(n);
-		return *rsa != NULL;
+		return rsa;
 	}
 
 	/* Else, check for PublicKeyFile statement and read it */
@@ -322,15 +324,15 @@ bool read_rsa_public_key(rsa_t **rsa, splay_tree_t *config_tree, const char *nam
 		return false;
 	}
 
-	*rsa = rsa_read_pem_public_key(fp);
+	rsa_t *rsa = rsa_read_pem_public_key(fp);
 	fclose(fp);
 
-	if(!*rsa) {
+	if(!rsa) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
 	}
 
 	free(fname);
 
-	return *rsa != NULL;
+	return rsa;
 }
 #endif